diff --git a/misc/alpine-install.func b/misc/alpine-install.func index 3e23ba540..537a3148e 100644 --- a/misc/alpine-install.func +++ b/misc/alpine-install.func @@ -34,42 +34,6 @@ EOF fi } -set -Eeuo pipefail -trap 'error_handler $? $LINENO "$BASH_COMMAND"' ERR -trap on_exit EXIT -trap on_interrupt INT -trap on_terminate TERM - -error_handler() { - local exit_code="$1" - local line_number="$2" - local command="$3" - - if [[ "$exit_code" -eq 0 ]]; then - return 0 - fi - - printf "\e[?25h" - echo -e "\n${RD}[ERROR]${CL} in line ${RD}$line_number${CL}: exit code ${RD}$exit_code${CL}: while executing command ${YW}$command${CL}\n" - exit "$exit_code" -} - -on_exit() { - local exit_code="$?" - [[ -n "${lockfile:-}" && -e "$lockfile" ]] && rm -f "$lockfile" - exit "$exit_code" -} - -on_interrupt() { - echo -e "\n${RD}Interrupted by user (SIGINT)${CL}" - exit 130 -} - -on_terminate() { - echo -e "\n${RD}Terminated by signal (SIGTERM)${CL}" - exit 143 -} - # This function sets up the Container OS by generating the locale, setting the timezone, and checking the network connection setting_up_container() { msg_info "Setting up Container OS" diff --git a/misc/install.func b/misc/install.func index b8a09a8b8..5a8d10d0b 100644 --- a/misc/install.func +++ b/misc/install.func @@ -172,7 +172,7 @@ network_check() { fi set -e - trap 'error_handler $LINENO "$BASH_COMMAND"' ERR + trap 'error_handler' ERR } # ==============================================================================