V8.00.000.2025.06.17

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>

lib/cdi_0050_debug/0050_debug_pre_scan.sh

@@ -22,42 +22,62 @@ guard_sourcing
 #   None
 #######################################
 pre_scan_debug() {
-  declare args=("$@")
-  declare dbg_index=-1
-  declare dbg_count=0
-  declare i j
+  declare -a args=("$@")
+  declare -i dbg_index=-1 dbg_count=0 i=0 j=0
 
   for i in "${!args[@]}"; do
+
     if [[ "${args[i]}" == "-d" || "${args[i]}" == "--debug" ]]; then
       dbg_index=${i}
+
       declare -grx LOG_VAR="${DIR_LOG}/ciss_debian_installer_$$_var.log"
       touch "${LOG_VAR}" && chmod 0600 "${LOG_VAR}"
+
+      # shellcheck disable=SC2155
+      declare -gx VAR_DUMP_VARS_INITIAL=$(mktemp var_dump_vars_initial.XXXXXXXX)
+      VAR_DUMP_VARS_INITIAL=$(readlink -f "${VAR_DUMP_VARS_INITIAL}")
+
+      # shellcheck disable=SC2155
+      declare -gx VAR_DUMP_VARS_FINAL=$(mktemp var_dump_vars_final.XXXXXXXX)
+      VAR_DUMP_VARS_FINAL=$(readlink -f "${VAR_DUMP_VARS_FINAL}")
+
       dump_vars_initial
       break
     fi
+
   done
 
   if (( dbg_index >= 0 )); then
+
     for (( j=dbg_index+1; j<${#args[@]} && dbg_count<2; j++ )); do
+
       [[ "${args[j]}" =~ ^- ]] && break
+
       case "${args[j],,}" in
+
         xtrace)
           declare -gx VAR_DEBUG_TRACE="true"
           debug_trace "$@"
           ;;
+
         trap)
           declare -gx VAR_DEBUG_TRAP="true"
           initialize_debug_trap
           trap 'debug_trap' DEBUG
           ;;
+
         *)
           arg_mismatch "Invalid debug option: '${args[j]}'." ;;
+
       esac
+
       dbg_count=$(( dbg_count + 1 ))
+
     done
 
     if (( dbg_count == 0 )); then arg_mismatch "--debug MUST NOT be empty."; fi
     if (( dbg_count > 2 )); then arg_mismatch "--debug accepts at most two options (XTRACE, TRAP)."; fi
+
   fi
 }
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

lib/cdi_0050_debug/0051_debug_var_dump.sh

@@ -20,8 +20,6 @@ guard_sourcing
 #   None
 #######################################
 dump_vars_initial() {
-  # shellcheck disable=SC2155
-  declare -grx VAR_DUMP_VARS_INITIAL=$(mktemp var_dump_vars_initial.XXXXXXXX)
   # shellcheck disable=SC2312
   {
     declare var
@@ -32,19 +30,16 @@ dump_vars_initial() {
 }
 
 #######################################
-# Gather all user-defined variables (name and value).
+# Capture the final snapshot of all variables (excluding '^(BASH|_).*').
 # Globals:
 #   LOG_VAR
+#   VAR_DUMP_VARS_FINAL
 #   VAR_DUMP_VARS_INITIAL
 #   VAR_VERSION
 # Arguments:
 #   None
 #######################################
 dump_vars_exiting() {
-  ### Capture the final snapshot of all variables (excluding '^(BASH|_).*').
-  # shellcheck disable=SC2155
-  declare var_dump_vars_final=$(mktemp var_dump_vars_final.XXXXXXXX)
-
   set +x
   # shellcheck disable=SC2312
   {
@@ -52,7 +47,7 @@ dump_vars_exiting() {
     while IFS= read -r var; do
       declare -p "${var}" 2>/dev/null
     done < <(compgen -v | grep -Ev '^(BASH|_).*')
-  } | sort >| "${var_dump_vars_final}"
+  } | sort >| "${VAR_DUMP_VARS_FINAL}"
   set -x
 
   {
@@ -63,7 +58,7 @@ dump_vars_exiting() {
   } >> "${LOG_VAR}"
 
   set +x
-  comm -23 "${VAR_DUMP_VARS_INITIAL}" "${var_dump_vars_final}" >> "${LOG_VAR}"  || true
+  comm -23 "${VAR_DUMP_VARS_INITIAL}" "${VAR_DUMP_VARS_FINAL}" >> "${LOG_VAR}"  || true
   set -x
 
   {
@@ -72,9 +67,9 @@ dump_vars_exiting() {
   } >> "${LOG_VAR}"
 
   set +x
-  comm -13 "${VAR_DUMP_VARS_INITIAL}" "${var_dump_vars_final}" >> "${LOG_VAR}" || true
+  comm -13 "${VAR_DUMP_VARS_INITIAL}" "${VAR_DUMP_VARS_FINAL}" >> "${LOG_VAR}" || true
   set -x
 
-  rm -f "${VAR_DUMP_VARS_INITIAL}" "${var_dump_vars_final}"
+  rm -f "${VAR_DUMP_VARS_INITIAL}" "${VAR_DUMP_VARS_FINAL}"
 }
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh