From 647de8fa434254dee90e6398d4c8c12b90fec248 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Tue, 6 May 2025 09:46:22 +0200 Subject: [PATCH] Update build.func --- misc/build.func | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/misc/build.func b/misc/build.func index 5c0201d..780da17 100644 --- a/misc/build.func +++ b/misc/build.func @@ -402,11 +402,11 @@ echo_default() { } # This function is called when the user decides to exit the script. It clears the screen and displays an exit message. -#exit_script() { -# clear -# echo -e "\n${CROSS}${RD}User exited script${CL}\n" -# exit -#} +exit_script() { + clear + echo -e "\n${CROSS}${RD}User exited script${CL}\n" + exit +} # This function allows the user to configure advanced settings for the script. advanced_settings() { @@ -1455,12 +1455,10 @@ silent() { fi } -exit_script() { +api_exit_script() { exit_code=$? # Capture the exit status of the last executed command #200 exit codes indicate error in create_lxc.sh #100 exit codes indicate error in install.func - clear - echo -e "\n${CROSS}${RD}User exited script${CL}\n" if [ $exit_code -ne 0 ]; then case $exit_code in @@ -1482,7 +1480,7 @@ exit_script() { exit } -trap 'exit_script' EXIT +trap 'api_exit_script' EXIT trap 'post_update_to_api "failed" "$BASH_COMMAND"' ERR trap 'post_update_to_api "failed" "INTERRUPTED"' SIGINT trap 'post_update_to_api "failed" "TERMINATED"' SIGTERM