V8.00.000.2025.06.17

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-07-25 13:11:30 +02:00
parent a3a9c2ef14
commit 33121b174f
25 changed files with 260 additions and 150 deletions

View File

@@ -34,6 +34,10 @@ restart_dialog() {
# Trap function to be called on 'SIGINT'.
# Globals:
# ERR_TRAPPED_SIG_INT
# GRE
# NL
# RED
# RES
# VAR_IN_DIALOG_WR
# Arguments:
# None
@@ -51,11 +55,11 @@ trap_int() {
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
printf "\e[92mCISS.debian.installer caught an INT. No User confirmation after 16 seconds. Proceeding with Installer. \e[0m\n" >&2
if [[ "${var_helper_dialog}" == box ]]; then
printf "%bCISS.debian.installer caught an INT. No User confirmation after 16 seconds. Proceeding with Installer. %b%b" "${GRE}" "${RES}" "${NL}" >&2
if [[ "${var_helper_dialog}" == "box" ]]; then
restart_dialog "${var_helper_dialog}"
return 0
elif [[ "${var_helper_dialog}" == gauge ]]; then
elif [[ "${var_helper_dialog}" == "gauge" ]]; then
restart_dialog "${var_helper_dialog}"
return 0
else
@@ -66,11 +70,11 @@ trap_int() {
case "${answer,,}" in
y|yes)
printf "\e[91mCISS.debian.installer caught an INT. SIGINT confirmed by User, exiting Installer. \e[0m\n" >&2
printf "%bCISS.debian.installer caught an INT. SIGINT confirmed by User, exiting Installer. %b%b" "${RED}" "${RES}" "${NL}" >&2
exit "${ERR_TRAPPED_SIG_INT}"
;;
*)
printf "\e[92mCISS.debian.installer caught an INT. SIGINT NOT confirmed by User, proceeding with Installer. \e[0m\n" >&2
printf "%bCISS.debian.installer caught an INT. SIGINT NOT confirmed by User, proceeding with Installer. %b%b" "${GRE}" "${RES}" "${NL}" >&2
if [[ "${var_helper_dialog}" == box ]]; then
restart_dialog "${var_helper_dialog}"
return 0