From 354d95eb2d13c55a46bfc0901bf624c3c1d33314 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Tue, 6 May 2025 09:50:11 +0200 Subject: [PATCH] Update build.func --- misc/build.func | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/misc/build.func b/misc/build.func index e09b6de2e..587c188d9 100644 --- a/misc/build.func +++ b/misc/build.func @@ -385,6 +385,13 @@ echo_default() { echo -e " " } +# 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 +} + # This function allows the user to configure advanced settings for the script. advanced_settings() { whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox --title "Here is an instructional tip:" "To make a selection, use the Spacebar." 8 58 @@ -1434,12 +1441,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 @@ -1458,10 +1463,9 @@ exit_script() { *) post_update_to_api "failed" "Unknown error, exit code: $exit_code in create_lxc.sh" ;; esac fi - 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