V8.00.000.2025.06.17

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

ciss_debian_installer.sh

@@ -138,14 +138,14 @@ if [[ "${VAR_SETUP}" == "true" ]]; then
 fi
 
 ### PREPARING DIRECTORIES AND FILES.
-color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: 0011_gen_dir_files.sh ..."
+color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: PREPARING DIRECTORIES AND FILES ..."
 gen_dir_files
 
 # TODO: Reactivate
 ### CHECKING REQUIRED PACKAGES.
 #color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: 0030_check_pkgs.sh ..."
 #check_pkgs
-color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: 0031_check_git.sh ..."
+color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: CHECKING REQUIRED PACKAGES ..."
 check_git
 
 ### ADVISORY LOCK.
@@ -161,7 +161,7 @@ if ! flock -x -n 127; then
 fi
 
 ### SCAN FOR DEBUG MODE.
-color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: 0050_debug_pre_scan.sh ..."
+color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: SCAN FOR DEBUG MODE ..."
 pre_scan_debug "$@"
 
 ### CHECK FOR AUTO INSTALL MODE.
@@ -181,17 +181,17 @@ trap 'trap_int' INT TERM
 #if ! "${VAR_AUTO_INSTALL}"; then check_kernel; fi
 
 ### Dialog Output for Initialization START.
-color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: Dialog Output for Initialization START ..."
+color_echo "${GRE}" "CISS.DEBIAN.INSTALLER PREPARATION: CHECK DIALOG WRAPPER ..."
 if ! "${VAR_AUTO_INSTALL}"; then . ./lib/cdi_0200_dialog/0200_dialog_helper.sh && dialog_box; fi
 
 ### ARGUMENT CHECKS.
-echo "MAIN PROGRAM SEQUENCE: 0101_arg_sanitizer.sh ..."
+echo "MAIN PROGRAM SEQUENCE: ARGUMENT CHECKS ..."
 arg_check "$@"
 declare -ar ARY_ARG_SANITIZED=("$@")
 declare -grx VAR_ARG_SANITIZED="${ARY_ARG_SANITIZED[*]}"
 
 ### ARGUMENT PARSING.
-echo "MAIN PROGRAM SEQUENCE: 0102_arg_parser.sh ..."
+echo "MAIN PROGRAM SEQUENCE: ARGUMENT PARSING ..."
 arg_parser "$@"
 
 ### PRIORITY UPDATES.

func/cdi_4000_debootstrap/4050_setup_locales.sh

@@ -64,23 +64,30 @@ setup_locales() {
 # SPDX-Security-Contact: security@coresecret.eu
 
 set -x
+exec 2>/tmp/locale-hook-debug.log
 set -Ceuo pipefail
 
-### Register selections
+if [[ ! -d /usr/share/i18n/locales ]]; then
+  echo "ERROR: Directory /usr/share/i18n/locales missing. Is package 'locales' installed?" >&2
+  exit 1
+fi
+
 echo "locales locales/locales_to_be_generated multiselect ${locale_locale:-en_US.UTF-8} UTF-8" | debconf-set-selections
 echo "locales locales/default_environment_locale select ${locale_locale:-en_US.UTF-8}" | debconf-set-selections
 
-### Reconfigure and regenerate
-dpkg-reconfigure -f noninteractive locales
-locale-gen
-
-if ! locale -a | grep -qx "${locale_locale:-en_US.UTF-8}" > /dev/null 2>&1 || true; then
-  echo "ERROR: Locale '${locale_locale:-en_US.UTF-8}' has not been generated successfully." >&2
-  sleep 30
+if ! grep -qx "${locale_locale:-en_US.UTF-8} UTF-8" /etc/locale.gen; then
+  sed -i "s/# ${locale_locale:-en_US.UTF-8} UTF-8/${locale_locale:-en_US.UTF-8} UTF-8/" /etc/locale.gen || \
+  echo "${locale_locale:-en_US.UTF-8} UTF-8" >> /etc/locale.gen
+fi
+
+locale-gen --purge "${locale_locale:-en_US.UTF-8}"
+
+if ! (locale -a | grep -qx "${locale_locale:-en_US.UTF-8}"); then
+  echo "ERROR: Locale '${locale_locale:-en_US.UTF-8}' was not generated successfully." >&2
+  locale -a >&2
+  exit 1
 fi
 
-locale -a
-cat /etc/locale.gen
 
 if update-locale \
 LANG=${locale_locale} \