V8.00.000.2025.06.17

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

lib/0050_debug_pre_scan.sh

@@ -14,6 +14,10 @@ guard_sourcing
 
 #######################################
 # Check for DEBUG mode.
+# Globals:
+#   LOG_VAR
+#   VAR_DEBUG_TRACE
+#   VAR_DEBUG_TRAP
 # Arguments:
 #   None
 #######################################
@@ -43,6 +47,7 @@ pre_scan_debug() {
           ;;
         trap)
           declare -gx VAR_DEBUG_TRAP="true"
+          initialize_debug_trap
           trap 'debug_trap' DEBUG
           ;;
         *)

lib/0051_debug_var_dump.sh

@@ -32,7 +32,7 @@ dump_vars_initial() {
 }
 
 #######################################
-# Gather all user-defined variables (name and value)
+# Gather all user-defined variables (name and value).
 # Globals:
 #   LOG_VAR
 #   VAR_DUMP_VARS_INITIAL

lib/0052_debug_trace.sh

@@ -16,6 +16,7 @@ guard_sourcing
 # Wrapper for XTRACE Debug.
 # Globals:
 #   BASH_XTRACEFD
+#   DIR_LOG
 #   LOG_TRC
 #   PS4
 #   SHELLOPTS

lib/0053_debug_trace_header.sh

@@ -28,9 +28,9 @@ guard_sourcing
 #   VAR_SYSTEM
 #   VAR_VERSION
 # Arguments:
-#   $0: Script Name $0
-#   $1: Argument Counter $#
-#   $2: Argument String $*
+#   0: Script Name $0
+#   1: Argument Counter $#
+#   2: Argument String $*
 #######################################
 debug_trace_header() {
   declare -r arg_counter="$1"

lib/0054_debug_trap.sh

@@ -12,23 +12,35 @@
 
 guard_sourcing
 
-declare -g VAR_LAST_CMD=""
-declare -g __preexec_invoke=""
-# shellcheck disable=SC2155
-declare -grx LOG_DBG="${DIR_LOG}/ciss_debian_installer_$$_debug.log"
-### Generates empty LOG_DBG
-touch "${LOG_DBG}" && chmod 0600 "${LOG_DBG}"
-### Write Debug Log Header https://www.gnu.org/software/bash/manual/html_node/Bash-Variables
-debug_trap_header "$#" "$*"
-### Define patterns and mask replacements
-declare -Ag MASK_PATTERNS=(
+#######################################
+# Initialize Trap on 'DEBUG'.
+# Globals:
+#   DIR_LOG
+#   LOG_DBG
+#   MASK_PATTERNS
+#   VAR_LAST_CMD
+# Arguments:
+#  None
+#######################################
+initialize_debug_trap() {
+  declare -gx VAR_LAST_CMD=""
+  declare -gx __preexec_invoke=""
+  # shellcheck disable=SC2155
+  declare -grx LOG_DBG="${DIR_LOG}/ciss_debian_installer_$$_debug.log"
+  ### Generates empty LOG_DBG
+  touch "${LOG_DBG}" && chmod 0600 "${LOG_DBG}"
+  ### Write Debug Log Header https://www.gnu.org/software/bash/manual/html_node/Bash-Variables
+  debug_trap_header "$#" "$*"
+  ### Define patterns and mask replacements
+  declare -Ag MASK_PATTERNS=(
     ["API_KEY"]="********"
     ["api_key"]="********"
     ["password"]="********"
     ["priv_key"]="********"
     ["secret"]="********"
     ["token"]="********"
-)
+  )
+}
 
 #######################################
 # Wrapper to write to DEBUG Logfile.
@@ -37,6 +49,7 @@ declare -Ag MASK_PATTERNS=(
 #   BASH_SOURCE
 #   FUNCNAME
 #   LOG_DBG
+#   PWD
 # Arguments:
 #   None
 #######################################
@@ -65,7 +78,6 @@ debug_trap_logger() {
 #   BASH_COMMAND
 #   MASK_PATTERNS
 #   VAR_LAST_CMD
-#   __preexec_invoke
 # Arguments:
 #   None
 # Returns:
@@ -92,11 +104,12 @@ debug_trap() {
 
   if [[ -n "${__preexec_invoke:-}" ]]; then
     debug_trap_logger "${rc}" "${VAR_LAST_CMD}"
-    declare -g __preexec_invoke=""
+    __preexec_invoke=""
   fi
 
-  declare -g __preexec_invoke=1
-  declare -g VAR_LAST_CMD="${var_cmd}"
+  __preexec_invoke=1
+  VAR_LAST_CMD="${var_cmd}"
+
   return 0
 }
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

lib/0055_debug_trap_header.sh

@@ -29,9 +29,9 @@ guard_sourcing
 #   VAR_SYSTEM
 #   VAR_VERSION
 # Arguments:
-#   $0: Script Name $0
-#   $1: Argument Counter $#
-#   $2: Argument String $*
+#   0: Script Name $0
+#   1: Argument Counter $#
+#   2: Argument String $*
 #######################################
 debug_trap_header() {
   declare -r arg_counter="$1"