V8.00.000.2025.06.17
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
@@ -105,7 +105,7 @@ for arg in "$@"; do case "${arg,,}" in -a|--autoinstall) declare -gx VAR_AUTO_IN
|
||||
|
||||
### ACTIVATING TRAPS
|
||||
trap 'trap_exit "$?" "${BASH_SOURCE[0]}" "${LINENO}" "${FUNCNAME[0]:-main}" "${BASH_COMMAND}"' EXIT
|
||||
trap 'trap_int' INT
|
||||
trap 'trap_int' INT TERM
|
||||
trap 'trap_err "$?" "${BASH_SOURCE[0]}" "${LINENO}" "${FUNCNAME[0]:-main}" "${BASH_COMMAND}"' ERR
|
||||
|
||||
### INTERACTIVE MODE NOTES AND KERNEL SELECTION
|
||||
@@ -121,6 +121,7 @@ if ! "${VAR_AUTO_INSTALL}"; then . ./lib/0200_dialog_helper.sh && dialog_box; fi
|
||||
arg_check "$@"
|
||||
declare -ar ARY_ARG_SANITIZED=("$@")
|
||||
declare -grx VAR_ARG_SANITIZED="${ARY_ARG_SANITIZED[*]}"
|
||||
VAR_PARAM_STRNG
|
||||
|
||||
arg_parser "$@"
|
||||
|
||||
|
||||
@@ -41,7 +41,7 @@ dump_vars_initial() {
|
||||
# None
|
||||
#######################################
|
||||
dump_vars_exiting() {
|
||||
### Capture the final snapshot of all variables (excluding '^(BASH|_).*')
|
||||
### 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
|
||||
|
||||
@@ -15,8 +15,6 @@ guard_sourcing
|
||||
#######################################
|
||||
# Print Error Message for Trap on 'ERR' in '${ERROR_LOG}'.
|
||||
# Globals:
|
||||
# VAR_PARAM_COUNT
|
||||
# ARG_STR_ORG_INPUT
|
||||
# ERRCMMD
|
||||
# ERRCODE
|
||||
# ERRFUNC
|
||||
@@ -32,6 +30,8 @@ guard_sourcing
|
||||
# VAR_DEBUG_TRACE
|
||||
# VAR_DEBUG_TRAP
|
||||
# VAR_GIT_HEAD
|
||||
# VAR_PARAM_COUNT
|
||||
# VAR_PARAM_STRNG
|
||||
# VAR_SYSTEM
|
||||
# VAR_VERSION
|
||||
# Arguments:
|
||||
@@ -51,7 +51,7 @@ print_file_err() {
|
||||
printf "❌ Script PID : %s %s" "${$}" "${NL}"
|
||||
printf "❌ Script Runtime : %s %s" "${SECONDS}" "${NL}"
|
||||
printf "❌ Arguments Counter : %s %s" "${VAR_PARAM_COUNT}" "${NL}"
|
||||
printf "❌ Arguments Original : %s %s" "${ARG_STR_ORG_INPUT}" "${NL}"
|
||||
printf "❌ Arguments Original : %s %s" "${VAR_PARAM_STRNG}" "${NL}"
|
||||
printf "❌ Arguments Sanitized : %s %s" "${VAR_ARG_SANITIZED}" "${NL}"
|
||||
if [[ "${VAR_DEBUG_TRACE}" == "true" || "${VAR_DEBUG_TRAP}" == "true" ]]; then
|
||||
printf "❌ Vars Dump saved at : %s %s" "${LOG_VAR}" "${NL}"
|
||||
@@ -71,10 +71,6 @@ print_file_err() {
|
||||
#######################################
|
||||
# Print Error Message for Trap on 'ERR' on Terminal.
|
||||
# Globals:
|
||||
# VAR_PARAM_COUNT
|
||||
# ARG_STR_ORG_INPUT
|
||||
# RED
|
||||
# RES
|
||||
# ERRCMMD
|
||||
# ERRCODE
|
||||
# ERRFUNC
|
||||
@@ -85,11 +81,15 @@ print_file_err() {
|
||||
# LOG_TRC
|
||||
# LOG_VAR
|
||||
# NL
|
||||
# RED
|
||||
# RES
|
||||
# SECONDS
|
||||
# VAR_ARG_SANITIZED
|
||||
# VAR_DEBUG_TRACE
|
||||
# VAR_DEBUG_TRAP
|
||||
# VAR_GIT_HEAD
|
||||
# VAR_PARAM_COUNT
|
||||
# VAR_PARAM_STRNG
|
||||
# VAR_SYSTEM
|
||||
# VAR_VERSION
|
||||
# Arguments:
|
||||
@@ -108,7 +108,7 @@ print_scr_err() {
|
||||
printf "%s❌ Script PID : %s %s%s" "${RED}" "${$}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Script Runtime : %s %s%s" "${RED}" "${SECONDS}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Arguments Counter : %s %s%s" "${RED}" "${VAR_PARAM_COUNT}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Arguments Original : %s %s%s" "${RED}" "${ARG_STR_ORG_INPUT}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Arguments Original : %s %s%s" "${RED}" "${VAR_PARAM_STRNG}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Arguments Sanitized : %s %s%s" "${RED}" "${VAR_ARG_SANITIZED}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Error Log saved at : %s %s%s" "${RED}" "${LOG_ERR}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ cat %s %s%s" "${RED}" "${LOG_ERR}" "${RES}" "${NL}" >&2
|
||||
@@ -123,9 +123,32 @@ print_scr_err() {
|
||||
printf "%s❌ Debug Log saved at : %s %s%s" "${RED}" "${LOG_TRC}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ cat %s %s%s" "${RED}" "${LOG_TRC}" "${RES}" "${NL}" >&2
|
||||
fi
|
||||
print_stacktrace
|
||||
printf "%s" "${NL}"
|
||||
}
|
||||
|
||||
#######################################
|
||||
# Print function() stacktrace.
|
||||
# Globals:
|
||||
# BASH_LINENO
|
||||
# BASH_SOURCE
|
||||
# FUNCNAME
|
||||
# NL
|
||||
# RED
|
||||
# RES
|
||||
# Arguments:
|
||||
# None
|
||||
#######################################
|
||||
print_stacktrace() {
|
||||
if (( ${#FUNCNAME[@]} > 2 )); then
|
||||
printf "%s" "${NL}"
|
||||
printf "%s❌ Call Stack (most recent call first): %s%s" "${RED}" "${RES}" "${NL}" >&2
|
||||
for ((i=1; i<${#FUNCNAME[@]}-1; i++)); do
|
||||
printf "%s❌ ↳ %s() at [%s:%s] %s%s" "${RED}" "${FUNCNAME[i]}" "${BASH_SOURCE[i]}" "${BASH_LINENO[i-1]}" "${RES}" "${NL}" >&2
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
#######################################
|
||||
# Trap function to be called on 'ERR'.
|
||||
# Globals:
|
||||
@@ -134,24 +157,27 @@ print_scr_err() {
|
||||
# ERRFUNC
|
||||
# ERRLINE
|
||||
# ERRSCRT
|
||||
# ERRTRAP
|
||||
# VAR_DEBUG_TRACE
|
||||
# VAR_DEBUG_TRAP
|
||||
# VAR_IN_DIALOG_WR
|
||||
# Arguments:
|
||||
# $1: "$?"
|
||||
# $2: "${BASH_SOURCE[0]}"
|
||||
# $3: "${LINENO}"
|
||||
# $4: "${FUNCNAME[0]:-main}"
|
||||
# $5: "${BASH_COMMAND}"
|
||||
# 1: "$?"
|
||||
# 2: "${BASH_SOURCE[0]}"
|
||||
# 3: "${LINENO}"
|
||||
# 4: "${FUNCNAME[0]:-main}"
|
||||
# 5: "${BASH_COMMAND}"
|
||||
#######################################
|
||||
trap_err() {
|
||||
trap - DEBUG ERR INT
|
||||
declare -g ERRCODE="$1"
|
||||
declare -g ERRSCRT="$2"
|
||||
declare -g ERRLINE="$3"
|
||||
declare -g ERRFUNC="$4"
|
||||
declare -g ERRCMMD="$5"
|
||||
ERRTRAP="true"
|
||||
declare -g ERRTRAP="true"
|
||||
|
||||
trap - DEBUG ERR INT TERM
|
||||
|
||||
if [[ "${VAR_DEBUG_TRACE}" == "true" || "${VAR_DEBUG_TRAP}" == "true" ]]; then dump_vars_exiting; fi
|
||||
case "${VAR_IN_DIALOG_WR}" in
|
||||
box ) dialog_box_cleaner ;;
|
||||
|
||||
@@ -10,125 +10,158 @@
|
||||
# SPDX-PackageName: CISS.debian.live.builder
|
||||
# SPDX-Security-Contact: security@coresecret.eu
|
||||
|
||||
# TODO: Unbound variable Debug Meta Cascade.
|
||||
|
||||
guard_sourcing
|
||||
|
||||
#######################################
|
||||
# Trap function to be called on 'EXIT'.
|
||||
# Handles also Errors like unbound variables, as they are not caught by Trap on 'ERR'.
|
||||
# Globals:
|
||||
# VAR_DEBUG_TRACE
|
||||
# VAR_DEBUG_TRAP
|
||||
# VAR_LAST_CMD
|
||||
# __preexec_invoke
|
||||
# Arguments:
|
||||
# 1: "$?"
|
||||
# 2: "${BASH_SOURCE[0]}"
|
||||
# 3: "${LINENO}"
|
||||
# 4: "${FUNCNAME[0]:-main}"
|
||||
# 5: "${BASH_COMMAND}"
|
||||
#######################################
|
||||
trap_exit() {
|
||||
trap - DEBUG ERR EXIT INT
|
||||
declare -r var_trap_on_exit_code="$1"
|
||||
declare -r var_trap_on_exit_scrt="$2"
|
||||
declare -r var_trap_on_exit_line="$3"
|
||||
declare -r var_trap_on_exit_func="$4"
|
||||
declare -r var_trap_on_exit_cmmd="$5"
|
||||
declare -r var_exit_code="$1"
|
||||
declare -r var_exit_scrt="$2"
|
||||
declare -r var_exit_line="$3"
|
||||
declare -r var_exit_func="$4"
|
||||
declare -r var_exit_cmmd="$5"
|
||||
|
||||
trap - DEBUG ERR EXIT INT TERM
|
||||
|
||||
if [[ -n "${__preexec_invoke:-}" ]]; then
|
||||
debug_trap_logger "${var_trap_on_exit_code}" "${VAR_LAST_CMD}"
|
||||
debug_trap_logger "${var_exit_code}" "${VAR_LAST_CMD}"
|
||||
unset __preexec_invoke
|
||||
fi
|
||||
|
||||
if (( var_trap_on_exit_code == 0 )); then
|
||||
if [[ "${VAR_DEBUG_TRACE}" == "true" || "${VAR_DEBUG_TRAP}" == "true" ]]; then dump_vars_exiting; fi
|
||||
clean_up "${var_trap_on_exit_code}"
|
||||
print_scr_exit "${var_trap_on_exit_code}"
|
||||
exit "${var_trap_on_exit_code}"
|
||||
if (( var_exit_code == 0 )); then
|
||||
trap_exit_zero "${var_exit_code}"
|
||||
else
|
||||
trap_exit_non_zero "${var_exit_code}" "${var_exit_scrt}" "${var_exit_line}" "${var_exit_func}" "${var_exit_cmmd}"
|
||||
fi
|
||||
}
|
||||
|
||||
#######################################
|
||||
# Trap on Exit Handler for '0' Exit-Code.
|
||||
# Globals:
|
||||
# GRE
|
||||
# LOG_DBG
|
||||
# LOG_TRC
|
||||
# LOG_VAR
|
||||
# MAG
|
||||
# NL
|
||||
# RES
|
||||
# VAR_DEBUG_TRACE
|
||||
# VAR_DEBUG_TRAP
|
||||
# VAR_SCRIPT_SUCCESS
|
||||
# Arguments:
|
||||
# 1: "$?" passed through by trap_exit()
|
||||
#######################################
|
||||
trap_exit_zero() {
|
||||
declare -r var_trap_exit_zero_code="$1"
|
||||
|
||||
if [[ "${VAR_DEBUG_TRACE}" == "true" || "${VAR_DEBUG_TRAP}" == "true" ]]; then dump_vars_exiting; fi
|
||||
clean_up "${var_trap_exit_zero_code}"
|
||||
|
||||
if [[ "${VAR_SCRIPT_SUCCESS}" == "true" ]]; then
|
||||
printf "%s" "${NL}"
|
||||
printf "%s✅ CISS.debian.installer Script successful. %s%s" "${GRE}" "${RES}" "${NL}"
|
||||
printf "%s✅ Exited with Status : %s %s%s" "${GRE}" "${var_trap_exit_zero_code}" "${RES}" "${NL}"
|
||||
printf "%s" "${NL}"
|
||||
if [[ "${VAR_DEBUG_TRACE}" == "true" || "${VAR_DEBUG_TRAP}" == "true" ]]; then
|
||||
printf "%s✅ Vars Dump saved at : %s %s%s" "${GRE}" "${LOG_VAR}" "${RES}" "${NL}"
|
||||
printf "%s✅ cat %s %s%s" "${GRE}" "${LOG_VAR}" "${RES}" "${NL}"
|
||||
fi
|
||||
if [[ "${VAR_DEBUG_TRAP}" == "true" ]]; then
|
||||
printf "%s✅ DEBUG Log saved at : %s %s%s" "${GRE}" "${LOG_DBG}" "${RES}" "${NL}"
|
||||
printf "%s✅ cat %s %s%s" "${GRE}" "${LOG_DBG}" "${RES}" "${NL}"
|
||||
fi
|
||||
if [[ "${VAR_DEBUG_TRACE}" == "true" ]]; then
|
||||
printf "%s✅ TRACE Log saved at : %s %s%s" "${GRE}" "${LOG_TRC}" "${RES}" "${NL}"
|
||||
printf "%s✅ cat %s %s%s" "${GRE}" "${LOG_TRC}" "${RES}" "${NL}"
|
||||
fi
|
||||
printf "%s" "${NL}"
|
||||
printf "%s💷 Please consider donating to my work at: %s%s" "${MAG}" "${RES}" "${NL}"
|
||||
printf "%s🔗 https://coresecret.eu/spenden/ %s%s" "${MAG}" "${RES}" "${NL}"
|
||||
printf "%s" "${NL}"
|
||||
fi
|
||||
exit "${var_trap_exit_zero_code}"
|
||||
}
|
||||
|
||||
#######################################
|
||||
# Trap on Exit Handler for 'Non-0' Exit-Code.
|
||||
# Globals:
|
||||
# ARG_STR_ORG_INPUT
|
||||
# ERRTRAP
|
||||
# LOG_DBG
|
||||
# LOG_TRC
|
||||
# LOG_VAR
|
||||
# NL
|
||||
# RED
|
||||
# RES
|
||||
# SECONDS
|
||||
# VAR_ARG_SANITIZED
|
||||
# VAR_DEBUG_TRACE
|
||||
# VAR_DEBUG_TRAP
|
||||
# VAR_GIT_HEAD
|
||||
# VAR_IN_DIALOG_WR
|
||||
# VAR_PARAM_COUNT
|
||||
# VAR_SYSTEM
|
||||
# VAR_VERSION
|
||||
# Arguments:
|
||||
# 1: "$?" passed through by trap_exit()
|
||||
# 2: "${BASH_SOURCE[0]}" passed through by trap_exit()
|
||||
# 3: "${LINENO}" passed through by trap_exit()
|
||||
# 4: "${FUNCNAME[0]:-main}" passed through by trap_exit()
|
||||
# 5: "${BASH_COMMAND}" passed through by trap_exit()
|
||||
#######################################
|
||||
trap_exit_non_zero() {
|
||||
declare -r var_code="$1"
|
||||
declare -r var_scrt="$2"
|
||||
declare -r var_line="$3"
|
||||
declare -r var_func="$4"
|
||||
declare -r var_cmmd="$5"
|
||||
|
||||
if [[ "${ERRTRAP}" == "false" ]]; then
|
||||
if [[ "${VAR_DEBUG_TRACE}" == "true" || "${VAR_DEBUG_TRAP}" == "true" ]]; then dump_vars_exiting; fi
|
||||
case "${VAR_IN_DIALOG_WR}" in
|
||||
box ) dialog_box_cleaner ;;
|
||||
gauge ) dialog_gauge_cleaner ;;
|
||||
esac
|
||||
fi
|
||||
clean_up "${var_trap_on_exit_code}"
|
||||
print_scr_exit "${var_trap_on_exit_code}" \
|
||||
"${var_trap_on_exit_scrt}" \
|
||||
"${var_trap_on_exit_line}" \
|
||||
"${var_trap_on_exit_func}" \
|
||||
"${var_trap_on_exit_cmmd}"
|
||||
exit "${var_trap_on_exit_code}"
|
||||
fi
|
||||
}
|
||||
|
||||
#######################################
|
||||
# Print Success Message for Trap on 'EXIT' on 'stdout'.
|
||||
# Globals:
|
||||
# LOG_DBG
|
||||
# LOG_TRC
|
||||
# LOG_VAR
|
||||
# VAR_DEBUG_TRACE
|
||||
# VAR_DEBUG_TRAP
|
||||
# VAR_SCRIPT_SUCCESS
|
||||
# Arguments:
|
||||
# 1: ${var_trap_on_exit_code} of trap_exit()
|
||||
#######################################
|
||||
print_scr_exit() {
|
||||
declare -r var_print_scr_exit_code="$1"
|
||||
declare -r var_print_scr_exit_scrt="$2"
|
||||
declare -r var_print_scr_exit_line="$3"
|
||||
declare -r var_print_scr_exit_func="$4"
|
||||
declare -r var_print_scr_exit_cmmd="$5"
|
||||
if (( var_print_scr_exit_code == 0 )); then
|
||||
if [[ "${VAR_SCRIPT_SUCCESS}" == "true" ]]; then
|
||||
printf "\n"
|
||||
printf "\e[92m✅ CISS.debian.installer Script successful. \e[0m\n"
|
||||
printf "\e[92m✅ Exited with Status : %s \e[0m\n" "${var_print_scr_exit_code}"
|
||||
printf "\n"
|
||||
if [[ "${VAR_DEBUG_TRACE}" == "true" || "${VAR_DEBUG_TRAP}" == "true" ]]; then
|
||||
printf "\e[92m✅ Vars Dump saved at : %s \e[0m\n" "${LOG_VAR}"
|
||||
printf "\e[92m✅ cat %s \e[0m\n" "${LOG_VAR}"
|
||||
fi
|
||||
if "${VAR_DEBUG_TRAP}"; then
|
||||
printf "\e[92m✅ DEBUG Log saved at : %s \e[0m\n" "${LOG_DBG}"
|
||||
printf "\e[92m✅ cat %s \e[0m\n" "${LOG_DBG}"
|
||||
fi
|
||||
if "${VAR_DEBUG_TRACE}"; then
|
||||
printf "\e[92m✅ TRACE Log saved at : %s \e[0m\n" "${LOG_TRC}"
|
||||
printf "\e[92m✅ cat %s \e[0m\n" "${LOG_TRC}"
|
||||
fi
|
||||
printf "\n"
|
||||
printf "\e[95m💷 Please consider donating to my work at: \e[0m\n"
|
||||
printf "\e[95m🔗 https://coresecret.eu/spenden/ \e[0m\n"
|
||||
printf "\n"
|
||||
fi
|
||||
else
|
||||
if [[ "${ERRTRAP}" == "false" ]]; then
|
||||
clean_up "${var_code}"
|
||||
printf "%s❌ CISS.debian.installer Script failed. Most probably cause of unbound variable. %s%s" "${RED}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ GIT Commit : %s %s%s" "${RED}" "${VAR_GIT_HEAD}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Version : %s %s%s" "${RED}" "${VAR_VERSION}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Hostsystem : %s %s%s" "${RED}" "${VAR_SYSTEM}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Error : %s %s%s" "${RED}" "${var_print_scr_exit_code}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Line : %s %s%s" "${RED}" "${var_print_scr_exit_line}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Script : %s %s%s" "${RED}" "${var_print_scr_exit_scrt}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Function : %s %s%s" "${RED}" "${var_print_scr_exit_func}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Command : %s %s%s" "${RED}" "${var_print_scr_exit_cmmd}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Error : %s %s%s" "${RED}" "${var_code}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Line : %s %s%s" "${RED}" "${var_line}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Script : %s %s%s" "${RED}" "${var_scrt}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Function : %s %s%s" "${RED}" "${var_func}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Command : %s %s%s" "${RED}" "${var_cmmd}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Script PID : %s %s%s" "${RED}" "${$}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Script Runtime : %s %s%s" "${RED}" "${SECONDS}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Arguments Counter : %s %s%s" "${RED}" "${VAR_PARAM_COUNT}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Arguments Original : %s %s%s" "${RED}" "${ARG_STR_ORG_INPUT}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Arguments Original : %s %s%s" "${RED}" "${VAR_PARAM_STRNG}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ Arguments Sanitized : %s %s%s" "${RED}" "${VAR_ARG_SANITIZED}" "${RES}" "${NL}" >&2
|
||||
if [[ "${VAR_DEBUG_TRACE}" == "true" || "${VAR_DEBUG_TRAP}" == "true" ]]; then
|
||||
printf "%s❌ Vars Dump saved at : %s %s%s" "${RED}" "${LOG_VAR}" "${RES}" "${NL}" >&2
|
||||
fi
|
||||
if "${VAR_DEBUG_TRAP}"; then
|
||||
if [[ "${VAR_DEBUG_TRAP}" == "true" ]]; then
|
||||
printf "%s❌ Debug Log saved at : %s %s%s" "${RED}" "${LOG_DBG}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ cat %s %s%s" "${RED}" "${LOG_DBG}" "${RES}" "${NL}" >&2
|
||||
fi
|
||||
if "${VAR_DEBUG_TRACE}"; then
|
||||
if [[ "${VAR_DEBUG_TRACE}" == "true" ]]; then
|
||||
printf "%s❌ Debug Log saved at : %s %s%s" "${RED}" "${LOG_TRC}" "${RES}" "${NL}" >&2
|
||||
printf "%s❌ cat %s %s%s" "${RED}" "${LOG_TRC}" "${RES}" "${NL}" >&2
|
||||
fi
|
||||
print_stacktrace
|
||||
fi
|
||||
fi
|
||||
|
||||
exit "${var_code}"
|
||||
}
|
||||
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
|
||||
|
||||
@@ -14,11 +14,14 @@ guard_sourcing
|
||||
|
||||
#######################################
|
||||
# Restart Dialog Wrapper in case of unintentional SIGINT.
|
||||
# Globals:
|
||||
# VAR_DEBUG_TRAP
|
||||
# Arguments:
|
||||
# 1: Dialog Wrapper in use.
|
||||
# 1: var_helper_dialog
|
||||
#######################################
|
||||
restart_dialog() {
|
||||
trap 'trap_int' INT
|
||||
[[ "${VAR_DEBUG_TRAP}" == "true" ]] && trap 'debug_trap' DEBUG
|
||||
trap 'trap_int' INT TERM
|
||||
trap 'trap_err "$?" "${BASH_SOURCE[0]}" "${LINENO}" "${FUNCNAME[0]:-main}" "${BASH_COMMAND}"' ERR
|
||||
case "$1" in
|
||||
box ) dialog_box ;;
|
||||
@@ -39,12 +42,12 @@ restart_dialog() {
|
||||
#######################################
|
||||
trap_int() {
|
||||
case "${VAR_IN_DIALOG_WR}" in
|
||||
box ) dialog_box_cleaner; declare var_helper_dialog=box ;;
|
||||
gauge ) dialog_gauge_cleaner; declare var_helper_dialog=gauge ;;
|
||||
* ) declare var_helper_dialog=false ;;
|
||||
box ) dialog_box_cleaner; declare var_helper_dialog="box" ;;
|
||||
gauge ) dialog_gauge_cleaner; declare var_helper_dialog="gauge" ;;
|
||||
* ) declare var_helper_dialog="false" ;;
|
||||
esac
|
||||
|
||||
trap '' ERR INT
|
||||
trap - DEBUG ERR INT TERM
|
||||
|
||||
declare answer
|
||||
if ! read -r -t 16 -p $'\n\e[93mCISS.debian.installer caught an INT.\e[0m \e[92mDo you want to abort the Installer? (y/N) \e[0m' answer; then
|
||||
|
||||
@@ -24,5 +24,6 @@ declare -gx VAR_AUTO_INSTALL="false"
|
||||
declare -gx VAR_DEBUG_TRACE="false"
|
||||
declare -gx VAR_DEBUG_TRAP="false"
|
||||
declare -gx VAR_IN_DIALOG_WR="false"
|
||||
declare -gx VAR_SCRIPT_SUCCESS="false"
|
||||
|
||||
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
# SPDX-PackageName: CISS.debian.installer
|
||||
# SPDX-Security-Contact: security@coresecret.eu
|
||||
|
||||
### Definition of MUST set global Variables
|
||||
### Definition of MUST set global Variables.
|
||||
|
||||
# shellcheck disable=SC2155
|
||||
declare -grx VAR_KERNEL_INF=$(mktemp var_kernel_inf.XXXXXXXX)
|
||||
@@ -23,14 +23,14 @@ declare -grx VAR_SETUP_FILE="${0##*/}" # 'setup
|
||||
declare -grx VAR_SETUP_PATH="$(cd "$(dirname "${0}")" && pwd)" # '/opt/git/CISS.debian.installer'
|
||||
declare -grx VAR_SETUP_FULL="$(cd "$(dirname "${0}")" && pwd)/${0##*/}" # '/opt/git/CISS.debian.installer/setup.sh'
|
||||
|
||||
### Initialize variables of different directories
|
||||
### Initialize variables of different directories.
|
||||
declare -grx DIR_BAK="/tmp/.ciss/backup"
|
||||
declare -grx DIR_LOG="/tmp/.ciss/log"
|
||||
declare -grx DIR_TMP="/tmp/.ciss/tmp"
|
||||
declare -grx DIR_CNF="${VAR_SETUP_PATH}/.preseed"
|
||||
declare -grx DIR_INS="${VAR_SETUP_PATH}"
|
||||
|
||||
### Initialize variables for logging
|
||||
### Initialize variables for logging.
|
||||
declare -grx LOG_ERR="${DIR_LOG}/ciss_debian_installer_$$_error.log"
|
||||
declare -grx LOG_INS="${DIR_LOG}/ciss_debian_installer_$$_install.log"
|
||||
declare -grx LOG_NIC="${DIR_LOG}/ciss_debian_installer_$$_nic.log"
|
||||
|
||||
Reference in New Issue
Block a user