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

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-08-07 21:50:03 +02:00
parent 19e56f4b9b
commit 0b5f9a151a
9 changed files with 67 additions and 24 deletions

View File

@@ -177,10 +177,8 @@ trap 'trap_err "$?" "${BASH_SOURCE[0]}" "${LINENO}" "${FUNCNAME[0]:-main}" "${B
trap 'trap_int' INT TERM trap 'trap_int' INT TERM
### INTERACTIVE MODE NOTES AND KERNEL SELECTION. ### INTERACTIVE MODE NOTES AND KERNEL SELECTION.
dialog_kernel if ! "${VAR_AUTO_INSTALL}"; then dialog_kernel; fi
dialog_notes if ! "${VAR_AUTO_INSTALL}"; then dialog_notes; fi
#if ! "${VAR_AUTO_INSTALL}"; then dialog_kernel; fi
#if ! "${VAR_AUTO_INSTALL}"; then dialog_notes; fi
### Dialog Output for Initialization START. ### Dialog Output for Initialization START.
color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: CHECK DIALOG WRAPPER ..." color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: CHECK DIALOG WRAPPER ..."

View File

@@ -80,6 +80,6 @@ yaml_parser() {
# shellcheck disable=SC1090 # shellcheck disable=SC1090
. "${VAR_PRESEED}" . "${VAR_PRESEED}"
return 0 guard_dir && return 0
} }
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

View File

@@ -187,6 +187,6 @@ END { print max }
# shellcheck disable=SC2034 # shellcheck disable=SC2034
VAR_RECOVERY="${!recipe_recovery_var,,}" VAR_RECOVERY="${!recipe_recovery_var,,}"
return 0 guard_dir && return 0
} }
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

View File

@@ -212,6 +212,6 @@ yaml_validator() {
fi fi
return 0 guard_dir && return 0
} }
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

View File

@@ -74,8 +74,11 @@ dropbear_build() {
' 2>&1 | tee -a "${TARGET}${var_logfile}" ' 2>&1 | tee -a "${TARGET}${var_logfile}"
[[ "${VAR_DEBUG_TRACE,,}" == "true" ]] && set -x [[ "${VAR_DEBUG_TRACE,,}" == "true" ]] && set -x
do_log "info" "file_only" "4310() Ultra Hardened [dropbear-${var_dropbear_version}] build successfully from sources." # shellcheck disable=SC2164
#cd "${VAR_SETUP_PATH}"
return 0 #do_log "info" "file_only" "4310() Ultra Hardened [dropbear-${var_dropbear_version}] build successfully from sources."
guard_dir && return 0
} }
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

View File

@@ -0,0 +1,26 @@
#!/bin/bash
# SPDX-Version: 3.0
# SPDX-CreationInfo: 2025-06-17; WEIDNER, Marc S.; <msw@coresecret.dev>
# SPDX-ExternalRef: GIT https://git.coresecret.dev/msw/CISS.debian.installer.git
# SPDX-FileContributor: WEIDNER, Marc S.; Centurion Intelligence Consulting Agency
# SPDX-FileCopyrightText: 2024-2025; WEIDNER, Marc S.; <msw@coresecret.dev>
# SPDX-FileType: SOURCE
# SPDX-License-Identifier: EUPL-1.2 OR LicenseRef-CCLA-1.0
# SPDX-LicenseComment: This file is part of the CISS.debian.installer.secure framework.
# SPDX-PackageName: CISS.debian.installer
# SPDX-Security-Contact: security@coresecret.eu
guard_sourcing
#######################################
# Function to log a module success message and change pwd to script root.
# Arguments:
# None
#######################################
guard_dir() {
declare mod="${BASH_SOURCE[0]##*/}"; mod="${mod%%_*}()"
# shellcheck disable=SC2164
cd "${VAR_SETUP_PATH}"
do_log "info" "file_only" "${mod} Finished successfully."
}
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

View File

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

View File

@@ -20,8 +20,6 @@ guard_sourcing
# None # None
####################################### #######################################
dump_vars_initial() { dump_vars_initial() {
# shellcheck disable=SC2155
declare -grx VAR_DUMP_VARS_INITIAL=$(mktemp var_dump_vars_initial.XXXXXXXX)
# shellcheck disable=SC2312 # shellcheck disable=SC2312
{ {
declare var 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: # Globals:
# LOG_VAR # LOG_VAR
# VAR_DUMP_VARS_FINAL
# VAR_DUMP_VARS_INITIAL # VAR_DUMP_VARS_INITIAL
# VAR_VERSION # VAR_VERSION
# Arguments: # Arguments:
# None # None
####################################### #######################################
dump_vars_exiting() { 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 set +x
# shellcheck disable=SC2312 # shellcheck disable=SC2312
{ {
@@ -52,7 +47,7 @@ dump_vars_exiting() {
while IFS= read -r var; do while IFS= read -r var; do
declare -p "${var}" 2>/dev/null declare -p "${var}" 2>/dev/null
done < <(compgen -v | grep -Ev '^(BASH|_).*') done < <(compgen -v | grep -Ev '^(BASH|_).*')
} | sort >| "${var_dump_vars_final}" } | sort >| "${VAR_DUMP_VARS_FINAL}"
set -x set -x
{ {
@@ -63,7 +58,7 @@ dump_vars_exiting() {
} >> "${LOG_VAR}" } >> "${LOG_VAR}"
set +x 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 set -x
{ {
@@ -72,9 +67,9 @@ dump_vars_exiting() {
} >> "${LOG_VAR}" } >> "${LOG_VAR}"
set +x 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 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 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

View File

@@ -12,6 +12,7 @@
source_guard "./lib/cdi_0005_guard/0007_guard_safe_exec.sh" source_guard "./lib/cdi_0005_guard/0007_guard_safe_exec.sh"
source_guard "./lib/cdi_0005_guard/0008_guard_variable.sh" source_guard "./lib/cdi_0005_guard/0008_guard_variable.sh"
source_guard "./lib/cdi_0005_guard/0009_guard_dir.sh"
source_guard "./lib/cdi_0010_basic/0011_gen_dir_files.sh" source_guard "./lib/cdi_0010_basic/0011_gen_dir_files.sh"
source_guard "./lib/cdi_0010_basic/0012_calculate_runtime.sh" source_guard "./lib/cdi_0010_basic/0012_calculate_runtime.sh"