V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 50s

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-07-24 20:43:32 +02:00
parent 65c13547c3
commit b9d4c2019c
11 changed files with 64 additions and 75 deletions

View File

@@ -15,8 +15,8 @@ guard_sourcing
#######################################
# Generic safe wrapper for external commands.
# Arguments:
# $*: full command (array, quoted!)
# $2: ERR_CONST on failure
# *: full command (array, quoted!)
# 2: ERR_CONST on failure
#######################################
safe_exec() {
declare -a ary_cmd=("${@:1:$#-1}") # All but last arg.

View File

@@ -16,12 +16,19 @@ guard_sourcing
# Creates the DIRs, prepares the files and mounting paths for installation.
# Globals:
# DIR_LOG
# LOG_DBS
# LOG_ERR
# LOG_INS
# LOG_NIC
# LOG_UID
# RECOVERY
# TARGET
# VAR_PRESEED
# VAR_SAFE_MNT_BASE
# Arguments:
# None
# None
# Returns:
# 0: on success
#######################################
gen_dir_files() {
### MAKE DIRS
@@ -41,5 +48,7 @@ gen_dir_files() {
touch "${DIR_LOG}/cpu.log" && chmod 0600 "${DIR_LOG}/cpu.log"
touch "${DIR_LOG}/ext4.log" && chmod 0600 "${DIR_LOG}/ext4.log"
touch "${DIR_LOG}/sshd_config.log" && chmod 0600 "${DIR_LOG}/sshd_config.log"
return 0
}
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

View File

@@ -18,9 +18,6 @@ guard_sourcing
# None
#######################################
pre_scan_debug() {
# shellcheck disable=SC2155
declare script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
. "${script_dir}/0100_arg_mismatch.sh"
declare args=("$@")
declare dbg_index=-1
declare dbg_count=0
@@ -29,8 +26,7 @@ pre_scan_debug() {
for i in "${!args[@]}"; do
if [[ "${args[i]}" == "-d" || "${args[i]}" == "--debug" ]]; then
dbg_index=${i}
. "${script_dir}/0051_debug_var_dump.sh"
declare -grx LOG_VAR="/tmp/ciss_debian_installer_$$_var.log"
declare -grx LOG_VAR="{DIR_LOG}/ciss_debian_installer_$$_var.log"
touch "${LOG_VAR}" && chmod 0600 "${LOG_VAR}"
dump_vars_initial
break
@@ -43,14 +39,10 @@ pre_scan_debug() {
case "${args[j],,}" in
xtrace)
declare -gx VAR_DEBUG_TRACE="true"
. "${script_dir}/0052_debug_trace.sh"
. "${script_dir}/0053_debug_trace_header.sh"
debug_trace "$@"
;;
trap)
declare -gx VAR_DEBUG_TRAP="true"
. "${script_dir}/0054_debug_trap.sh"
. "${script_dir}/0055_debug_trap_header.sh"
trap 'debug_trap' DEBUG
;;
*)

View File

@@ -21,7 +21,7 @@ guard_sourcing
#######################################
dump_vars_initial() {
# shellcheck disable=SC2155
declare -grx VAR_DUMP_VARS_INITIAL=$(mktemp)
declare -grx VAR_DUMP_VARS_INITIAL="$(mktemp --tmpdir --mode=0600 /tmp/var_dump_vars_initial.XXXXXXXX)"
# shellcheck disable=SC2312
{
declare var
@@ -43,7 +43,7 @@ dump_vars_initial() {
dump_vars_exiting() {
### Capture the final snapshot of all variables (excluding '^(BASH|_).*')
# shellcheck disable=SC2155
declare var_dump_vars_final=$(mktemp)
declare var_dump_vars_final="$(mktemp --tmpdir --mode=0600 /tmp/var_dump_vars_final.XXXXXXXX)"
set +x
# shellcheck disable=SC2312
{

View File

@@ -10,6 +10,8 @@
# SPDX-PackageName: CISS.debian.installer
# SPDX-Security-Contact: security@coresecret.eu
# TODO: Update this module
guard_sourcing
#######################################

View File

@@ -10,6 +10,8 @@
# SPDX-PackageName: CISS.debian.installer
# SPDX-Security-Contact: security@coresecret.eu
# TODO: Update this module
guard_sourcing
#######################################
@@ -20,9 +22,9 @@ guard_sourcing
check_provider() {
clear
cat << 'EOF' >| "${VAR_NOTES}"
Build: Master V8.03.768.2025.06.17
Build: Master V8.00.000.2025.06.17
Press 'EXIT' to continue with CISS.debian.live.builder.
Press 'EXIT' to continue with CISS.debian.installer.
When you provision ISO images using the Netcup provider, you MUST always supply a globally unique identifier
for each image via the --control argument. If you omit this flag or reuse an existing identifier, Netcup's
@@ -58,7 +60,7 @@ EOF
dialog --no-collapse \
--ascii-lines \
--clear \
--backtitle "CISS.debian.live.builder" \
--backtitle "CISS.debian.installer" \
--title "Important Notes" \
--scrollbar \
--textbox "${VAR_NOTES}" 32 128