diff --git a/ciss_live_builder.sh b/ciss_live_builder.sh index e239c18..07d928f 100644 --- a/ciss_live_builder.sh +++ b/ciss_live_builder.sh @@ -40,8 +40,8 @@ [[ ${#} -eq 0 ]] && { . ./lib/lib_usage.sh; usage; exit 1; } -declare -grx VAR_CONTACT="security@coresecret.eu" -declare -grx VAR_VERSION="Master V8.03.768.2025.06.18" +declare -gx VAR_CONTACT="security@coresecret.eu" +declare -gx VAR_VERSION="Master V8.03.768.2025.06.18" ### VERY EARLY CHECK FOR CONTACT, HELP, AND VERSION STRING for arg in "$@"; do case "${arg,,}" in -c|--contact) . ./lib/lib_contact.sh; contact; exit 0;; esac; done @@ -53,15 +53,9 @@ if [[ $* == *" --debug "* ]]; then . ./lib/lib_debug.sh debugger "${@}" else - declare -grx VAR_EARLY_DEBUG="false" + declare -gx VAR_EARLY_DEBUG=false fi -### VERY EARLY CHECK FOR AUTOBUILD MODE -declare -gr VAR_HANDLER_AUTOBUILD=false -for arg in "$@"; do case "${arg,,}" in -a=*|--autobuild=*) declare -grx VAR_HANDLER_AUTOBUILD=true; declare -gx VAR_KERNEL="${arg#*=}";; esac; done -unset arg -for dir in /usr/local/sbin /usr/sbin; do case ":${PATH}:" in *":${dir}:"*) ;; *) PATH="${PATH}:${dir}" ;; esac; done; export PATH; unset dir - ### Advisory Lock exec 127>/var/lock/ciss_live_builder.lock || { . ./var/global.var.sh @@ -75,6 +69,12 @@ if ! flock -x -n 127; then exit "${ERR_FLOCK_COLL}" fi +### VERY EARLY CHECK FOR AUTOBUILD MODE +declare -gx VAR_HANDLER_AUTOBUILD=false +for arg in "$@"; do case "${arg,,}" in -a=*|--autobuild=*) declare -gx VAR_HANDLER_AUTOBUILD=true; declare -gx VAR_KERNEL="${arg#*=}";; esac; done +unset arg +for dir in /usr/local/sbin /usr/sbin; do case ":${PATH}:" in *":${dir}:"*) ;; *) PATH="${PATH}:${dir}" ;; esac; done; export PATH; unset dir + ### Checking required packages . ./lib/lib_check_pkgs.sh check_pkgs diff --git a/lib/lib_debug.sh b/lib/lib_debug.sh index 4607d24..c66a13d 100644 --- a/lib/lib_debug.sh +++ b/lib/lib_debug.sh @@ -34,7 +34,7 @@ debugger() { declare -p "${var}" 2>/dev/null done < <(compgen -v | grep -Ev '^(BASH|_).*') } | sort >| "${VAR_DUMP_VARS_INITIAL}" - declare -grx VAR_EARLY_DEBUG=true + declare -gx VAR_EARLY_DEBUG=true ### Set a verbose PS4 prompt including timestamp, source, line, exit status, and function name declare -grx PS4='\e[97m+\e[0m\e[96m$(date +%T.%4N)\e[0m\e[97m:\e[0m\e[92m[${BASH_SOURCE[0]}:${LINENO}]\e[0m\e[97m|\e[0m\e[93m${?}\e[0m\e[97m>\e[0m\e[95m${FUNCNAME[0]:-main}()\e[0m \e[97m>>\e[0m ' # shellcheck disable=SC2155