Replace init_error_traps with catch_errors in scripts

Replaces all occurrences of the 'init_error_traps' function with 'catch_errors' across container and install scripts for consistency in error handling. Also adjusts indentation and formatting in some scripts for improved readability.
2026-02-26 00:55:54 +00:00 · 2025-09-19 08:53:49 +02:00
parent fe3de07157
commit b840a8aa32
107 changed files with 497 additions and 498 deletions
--- a/ct/alpine-caddy.sh
+++ b/ct/alpine-caddy.sh
@@ -17,24 +17,24 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
-   header_info
-   check_container_storage
-   check_container_resources
-   if [[ ! -d /etc/caddy ]]; then
-      msg_error "No ${APP} Installation Found!"
-      exit
-   fi
-   msg_info "Updating $APP LXC"
-   $STD apk -U upgrade
-   msg_ok "Updated $APP LXC"
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -d /etc/caddy ]]; then
+        msg_error "No ${APP} Installation Found!"
+        exit
+    fi
+    msg_info "Updating $APP LXC"
+    $STD apk -U upgrade
+    msg_ok "Updated $APP LXC"

-   msg_info "Restarting Caddy"
-   rc-service caddy restart
-   msg_ok "Restarted Caddy"
-   exit
+    msg_info "Restarting Caddy"
+    rc-service caddy restart
+    msg_ok "Restarted Caddy"
+    exit
 }

 start
--- a/ct/alpine.sh
+++ b/ct/alpine.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/debian.sh
+++ b/ct/debian.sh
@@ -19,7 +19,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/alpine-homarr.sh
+++ b/ct/deferred/alpine-homarr.sh
@@ -18,7 +18,7 @@ header_info "$APP"

 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/ampache.sh
+++ b/ct/deferred/ampache.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/ghostfolio.sh
+++ b/ct/deferred/ghostfolio.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/hoodik.sh
+++ b/ct/deferred/hoodik.sh
@@ -18,7 +18,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/jumpserver.sh
+++ b/ct/deferred/jumpserver.sh
@@ -17,7 +17,7 @@ var_unprivileged="1"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/kasm.sh
+++ b/ct/deferred/kasm.sh
@@ -19,7 +19,7 @@ var_tun="${var_tun:-yes}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/koel.sh
+++ b/ct/deferred/koel.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/librespeed.sh
+++ b/ct/deferred/librespeed.sh
@@ -17,7 +17,7 @@ var_unprivileged="1"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/netbootxyz.sh
+++ b/ct/deferred/netbootxyz.sh
@@ -26,7 +26,7 @@ var_os="${var_os:-debian}"
 var_version="${var_version:-12}"
 variables
 color
-init_error_traps
+catch_errors

 function default_settings() {
    CT_TYPE="1"
--- a/ct/deferred/nginxproxymanager.sh
+++ b/ct/deferred/nginxproxymanager.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/ocis.sh
+++ b/ct/deferred/ocis.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/openwebui.sh
+++ b/ct/deferred/openwebui.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/pixelfed.sh
+++ b/ct/deferred/pixelfed.sh
@@ -16,7 +16,7 @@ var_version="${var_version:-12}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/polaris.sh
+++ b/ct/deferred/polaris.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/roundcubemail.sh
+++ b/ct/deferred/roundcubemail.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/squirrelserversmanager.sh
+++ b/ct/deferred/squirrelserversmanager.sh
@@ -16,7 +16,7 @@ var_unprivileged="${var_unprivileged:-1}"

 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/deferred/vikunja.sh
+++ b/ct/deferred/vikunja.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/dispatcharr.sh
+++ b/ct/dispatcharr.sh
@@ -18,7 +18,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/docspell.sh
+++ b/ct/docspell.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/ente.sh
+++ b/ct/ente.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/freepbx.sh
+++ b/ct/freepbx.sh
@@ -18,7 +18,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/frigate.sh
+++ b/ct/frigate.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-0}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/garmin-grafana.sh
+++ b/ct/garmin-grafana.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 # this only updates garmin-grafana, not influxdb or grafana, which are upgraded with apt
 function update_script() {
--- a/ct/ghostfolio.sh
+++ b/ct/ghostfolio.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/globaleaks.sh
+++ b/ct/globaleaks.sh
@@ -16,21 +16,21 @@ var_version="${var_version:-13}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
-  header_info
-  check_container_storage
-  check_container_resources
-  if [[ ! -f /usr/sbin/globaleaks ]]; then
-    msg_error "No ${APP} installation found!"
-    exit
-  fi
+    header_info
+    check_container_storage
+    check_container_resources
+    if [[ ! -f /usr/sbin/globaleaks ]]; then
+        msg_error "No ${APP} installation found!"
+        exit
+    fi

-  msg_info "Updating $APP LXC"
-  $STD apt update
-  $STD apt -y upgrade
-  msg_ok "Updated $APP LXC"
+    msg_info "Updating $APP LXC"
+    $STD apt update
+    $STD apt -y upgrade
+    msg_ok "Updated $APP LXC"
 }

 start
--- a/ct/hanko.sh
+++ b/ct/hanko.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/joplin-server.sh
+++ b/ct/joplin-server.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/kanba.sh
+++ b/ct/kanba.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/leantime.sh
+++ b/ct/leantime.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/librenms.sh
+++ b/ct/librenms.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/livebook.sh
+++ b/ct/livebook.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/manyfold.sh
+++ b/ct/manyfold.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/maxun.sh
+++ b/ct/maxun.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/notesnook.sh
+++ b/ct/notesnook.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/npmplus.sh
+++ b/ct/npmplus.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    UPD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "UPDATE MODE" --radiolist --cancel-button Exit-Script "Spacebar = Select" 14 60 2 \
--- a/ct/opencloud.sh
+++ b/ct/opencloud.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/postiz.sh
+++ b/ct/postiz.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/proxmox-datacenter-manager.sh
+++ b/ct/proxmox-datacenter-manager.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/romm.sh
+++ b/ct/romm.sh
@@ -18,7 +18,7 @@ var_fuse="${var_fuse:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/rybbit.sh
+++ b/ct/rybbit.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/scraparr.sh
+++ b/ct/scraparr.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/signoz.sh
+++ b/ct/signoz.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/tunarr.sh
+++ b/ct/tunarr.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors
 function update_script() {
    header_info
    check_container_storage
--- a/ct/ubuntu.sh
+++ b/ct/ubuntu.sh
@@ -19,7 +19,7 @@ var_unprivileged="${var_unprivileged:-0}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/viseron.sh
+++ b/ct/viseron.sh
@@ -14,7 +14,7 @@ header_info "$APP"

 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/wallabag.sh
+++ b/ct/wallabag.sh
@@ -22,7 +22,7 @@ base_settings
 # Core
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info
--- a/ct/warracker.sh
+++ b/ct/warracker.sh
@@ -17,7 +17,7 @@ var_unprivileged="${var_unprivileged:-1}"
 header_info "$APP"
 variables
 color
-init_error_traps
+catch_errors

 function update_script() {
    header_info