From 5a92816946ba9384f29fc93fc3f0ed8ae75b669d Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Thu, 30 Oct 2025 05:03:54 -0700 Subject: [PATCH] Add explicit exit calls to update_script functions (#8752) --- ct/alpine-adguard.sh | 1 - ct/alpine-bitmagnet.sh | 1 - ct/alpine-caddy.sh | 2 +- ct/alpine-docker.sh | 1 + ct/alpine-forgejo.sh | 1 - ct/alpine-garage.sh | 2 +- ct/alpine-gatus.sh | 1 - ct/alpine-gitea.sh | 2 +- ct/alpine-grafana.sh | 1 + ct/alpine-it-tools.sh | 1 - ct/alpine-komodo.sh | 2 +- ct/alpine-mariadb.sh | 1 - ct/alpine-nextcloud.sh | 1 + ct/alpine-node-red.sh | 1 - ct/alpine-postgresql.sh | 1 - ct/alpine-prometheus.sh | 1 - ct/alpine-rclone.sh | 1 - ct/alpine-redlib.sh | 3 +-- ct/alpine-syncthing.sh | 3 +-- ct/alpine-teamspeak-server.sh | 1 - ct/alpine-traefik.sh | 2 +- ct/alpine-transmission.sh | 3 +-- ct/alpine-wireguard.sh | 1 - ct/bytestash.sh | 3 ++- ct/cosmos.sh | 3 ++- ct/cronicle.sh | 1 - ct/freshrss.sh | 33 +++++++++++++++++---------------- ct/globaleaks.sh | 1 + ct/lyrionmusicserver.sh | 1 + ct/oauth2-proxy.sh | 1 + ct/salt.sh | 1 + 31 files changed, 36 insertions(+), 42 deletions(-) diff --git a/ct/alpine-adguard.sh b/ct/alpine-adguard.sh index 5609001ed..5c6f233db 100644 --- a/ct/alpine-adguard.sh +++ b/ct/alpine-adguard.sh @@ -32,7 +32,6 @@ function update_script() { msg_info "Restarting AdGuard Home" $STD rc-service adguardhome restart msg_ok "Restarted AdGuard Home" - exit 0 } diff --git a/ct/alpine-bitmagnet.sh b/ct/alpine-bitmagnet.sh index d5ccc0b68..cc470827d 100644 --- a/ct/alpine-bitmagnet.sh +++ b/ct/alpine-bitmagnet.sh @@ -75,7 +75,6 @@ function update_script() { else msg_ok "No update required. ${APP} is already at ${RELEASE}" fi - exit 0 } diff --git a/ct/alpine-caddy.sh b/ct/alpine-caddy.sh index e51ac7fe6..88597df08 100644 --- a/ct/alpine-caddy.sh +++ b/ct/alpine-caddy.sh @@ -32,7 +32,7 @@ function update_script() { msg_info "Restarting Caddy" rc-service caddy restart msg_ok "Restarted Caddy" - exit + exit 0 } start diff --git a/ct/alpine-docker.sh b/ct/alpine-docker.sh index f18b8edac..0b58de520 100644 --- a/ct/alpine-docker.sh +++ b/ct/alpine-docker.sh @@ -41,6 +41,7 @@ function update_script() { ;; esac done + exit 0 } start diff --git a/ct/alpine-forgejo.sh b/ct/alpine-forgejo.sh index ff1773aee..e94feac2b 100644 --- a/ct/alpine-forgejo.sh +++ b/ct/alpine-forgejo.sh @@ -31,7 +31,6 @@ function update_script() { msg_info "Restarting Forgejo" $STD rc-service forgejo restart msg_ok "Restarted Forgejo" - exit 0 } diff --git a/ct/alpine-garage.sh b/ct/alpine-garage.sh index 15b10c12a..64ef30453 100644 --- a/ct/alpine-garage.sh +++ b/ct/alpine-garage.sh @@ -50,7 +50,7 @@ function update_script() { else msg_ok "No update required. Garage is already at ${GITEA_RELEASE}" fi - exit + exit 0 } start diff --git a/ct/alpine-gatus.sh b/ct/alpine-gatus.sh index 60e9fccec..39393dae0 100644 --- a/ct/alpine-gatus.sh +++ b/ct/alpine-gatus.sh @@ -48,7 +48,6 @@ function update_script() { else msg_ok "No update required. ${APP} is already at ${RELEASE}" fi - exit 0 } diff --git a/ct/alpine-gitea.sh b/ct/alpine-gitea.sh index 3e52b8e4f..822dbf762 100644 --- a/ct/alpine-gitea.sh +++ b/ct/alpine-gitea.sh @@ -32,7 +32,7 @@ function update_script() { msg_info "Restarting Gitea" rc-service gitea restart msg_ok "Restarted Gitea" - exit + exit 0 } start diff --git a/ct/alpine-grafana.sh b/ct/alpine-grafana.sh index 82f7d3220..1e4cee4cf 100644 --- a/ct/alpine-grafana.sh +++ b/ct/alpine-grafana.sh @@ -54,6 +54,7 @@ function update_script() { ;; esac done + exit 0 } start diff --git a/ct/alpine-it-tools.sh b/ct/alpine-it-tools.sh index fdf8c73db..a22f6702d 100644 --- a/ct/alpine-it-tools.sh +++ b/ct/alpine-it-tools.sh @@ -41,7 +41,6 @@ function update_script() { else msg_ok "No update required. ${APP} is already at ${RELEASE}" fi - exit 0 } diff --git a/ct/alpine-komodo.sh b/ct/alpine-komodo.sh index 9147a31cc..d29a5b479 100644 --- a/ct/alpine-komodo.sh +++ b/ct/alpine-komodo.sh @@ -55,7 +55,7 @@ function update_script() { $STD docker compose -p komodo -f "$COMPOSE_FILE" --env-file /opt/komodo/compose.env pull $STD docker compose -p komodo -f "$COMPOSE_FILE" --env-file /opt/komodo/compose.env up -d msg_ok "Updated ${APP}" - exit + exit 0 } start diff --git a/ct/alpine-mariadb.sh b/ct/alpine-mariadb.sh index 171cac391..0f84c767e 100644 --- a/ct/alpine-mariadb.sh +++ b/ct/alpine-mariadb.sh @@ -31,7 +31,6 @@ function update_script() { msg_info "Restarting MariaDB" $STD rc-service mariadb restart msg_ok "Restarted MariaDB" - exit 0 } diff --git a/ct/alpine-nextcloud.sh b/ct/alpine-nextcloud.sh index 566b9c0d1..624653e30 100644 --- a/ct/alpine-nextcloud.sh +++ b/ct/alpine-nextcloud.sh @@ -50,6 +50,7 @@ function update_script() { ;; esac done + exit 0 } start diff --git a/ct/alpine-node-red.sh b/ct/alpine-node-red.sh index 054cbbb2e..39c6bbe9c 100644 --- a/ct/alpine-node-red.sh +++ b/ct/alpine-node-red.sh @@ -31,7 +31,6 @@ function update_script() { msg_info "Updating Node-RED" $STD npm install -g --unsafe-perm node-red msg_ok "Updated Node-RED" - exit 0 } diff --git a/ct/alpine-postgresql.sh b/ct/alpine-postgresql.sh index e8ed89045..63630e231 100644 --- a/ct/alpine-postgresql.sh +++ b/ct/alpine-postgresql.sh @@ -31,7 +31,6 @@ function update_script() { msg_info "Restarting PostgreSQL" $STD rc-service postgresql restart msg_ok "Restarted PostgreSQL" - exit 0 } diff --git a/ct/alpine-prometheus.sh b/ct/alpine-prometheus.sh index e1b1796e6..5d358d4da 100644 --- a/ct/alpine-prometheus.sh +++ b/ct/alpine-prometheus.sh @@ -31,7 +31,6 @@ function update_script() { msg_info "Restarting Prometheus" $STD rc-service prometheus restart msg_ok "Restarted Prometheus" - exit 0 } diff --git a/ct/alpine-rclone.sh b/ct/alpine-rclone.sh index c8c4c9255..ec25f2286 100644 --- a/ct/alpine-rclone.sh +++ b/ct/alpine-rclone.sh @@ -38,7 +38,6 @@ function update_script() { else msg_ok "No update required. ${APP} is already at ${RELEASE}" fi - exit 0 } diff --git a/ct/alpine-redlib.sh b/ct/alpine-redlib.sh index fa78845e1..6e486210d 100644 --- a/ct/alpine-redlib.sh +++ b/ct/alpine-redlib.sh @@ -41,9 +41,8 @@ function update_script() { msg_info "Starting Service" $STD rc-service redlib start msg_ok "Started Service" - msg_ok "Update Successful" - exit + exit 0 } start diff --git a/ct/alpine-syncthing.sh b/ct/alpine-syncthing.sh index 3d41f5dba..bbdc24073 100644 --- a/ct/alpine-syncthing.sh +++ b/ct/alpine-syncthing.sh @@ -31,8 +31,7 @@ function update_script() { msg_info "Restarting Syncthing" $STD rc-service syncthing restart msg_ok "Restarted Syncthing" - - exit 1 + exit 0 } start diff --git a/ct/alpine-teamspeak-server.sh b/ct/alpine-teamspeak-server.sh index 524f02aaa..dbbd8792f 100644 --- a/ct/alpine-teamspeak-server.sh +++ b/ct/alpine-teamspeak-server.sh @@ -44,7 +44,6 @@ function update_script() { else msg_ok "No update required. ${APP} is already at ${RELEASE}" fi - exit 0 } diff --git a/ct/alpine-traefik.sh b/ct/alpine-traefik.sh index c472b985a..acf2f602a 100644 --- a/ct/alpine-traefik.sh +++ b/ct/alpine-traefik.sh @@ -28,7 +28,7 @@ function update_script() { msg_info "Upgrading traefik from edge" $STD apk add traefik --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community msg_ok "Upgraded traefik" - exit + exit 0 } start diff --git a/ct/alpine-transmission.sh b/ct/alpine-transmission.sh index b311e3c96..6c1dc773b 100644 --- a/ct/alpine-transmission.sh +++ b/ct/alpine-transmission.sh @@ -31,8 +31,7 @@ function update_script() { msg_info "Restarting Transmission" $STD rc-service transmission-daemon restart msg_ok "Restarted Transmission" - - exit 1 + exit 0 } start diff --git a/ct/alpine-wireguard.sh b/ct/alpine-wireguard.sh index e7d11d49c..47a3ae692 100644 --- a/ct/alpine-wireguard.sh +++ b/ct/alpine-wireguard.sh @@ -36,7 +36,6 @@ function update_script() { $STD ./wgd.sh start msg_ok "WGDashboard updated" fi - exit 0 } diff --git a/ct/bytestash.sh b/ct/bytestash.sh index 55aebf29a..b25e696d3 100644 --- a/ct/bytestash.sh +++ b/ct/bytestash.sh @@ -54,8 +54,9 @@ function update_script() { msg_error "PLEASE MAKE A BACKUP FIRST!" exit fi - msg_ok "Updated Successfully" + msg_ok "Updated Successfully!" fi + exit } start diff --git a/ct/cosmos.sh b/ct/cosmos.sh index a25b64164..3b08ff7f8 100644 --- a/ct/cosmos.sh +++ b/ct/cosmos.sh @@ -28,6 +28,7 @@ function update_script() { exit fi msg_ok "${APP} updates itself automatically!" + exit } start @@ -37,4 +38,4 @@ description msg_ok "Completed Successfully!\n" echo -e "${CREATING}${GN}${APP} setup has been successfully initialized!${CL}" echo -e "${INFO}${YW} Access it using the following URL:${CL}" -echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}" \ No newline at end of file +echo -e "${TAB}${GATEWAY}${BGN}http://${IP}${CL}" diff --git a/ct/cronicle.sh b/ct/cronicle.sh index 844c22edf..ba042862a 100644 --- a/ct/cronicle.sh +++ b/ct/cronicle.sh @@ -62,7 +62,6 @@ function update_script() { sed -i "s/localhost:3012/${IP}:3012/g" /opt/cronicle/conf/config.json $STD /opt/cronicle/bin/control.sh start msg_ok "Installed Cronicle Worker" - echo -e "\n Add Masters secret key to /opt/cronicle/conf/config.json \n" exit fi diff --git a/ct/freshrss.sh b/ct/freshrss.sh index 69acd16ce..0eb31e66f 100644 --- a/ct/freshrss.sh +++ b/ct/freshrss.sh @@ -20,23 +20,24 @@ color catch_errors function update_script() { - header_info - check_container_storage - check_container_resources - if [[ ! -d /opt/freshrss ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi + header_info + check_container_storage + check_container_resources + if [[ ! -d /opt/freshrss ]]; then + msg_error "No ${APP} Installation Found!" + exit + fi - if [ ! -x /opt/freshrss/cli/sensitive-log.sh ]; then - msg_info "Fixing wrong permissions" - chmod +x /opt/freshrss/cli/sensitive-log.sh - systemctl restart apache2 - msg_ok "Fixed wrong permissions" - else - msg_error "FreshRSS should be updated via the user interface." - exit - fi + if [ ! -x /opt/freshrss/cli/sensitive-log.sh ]; then + msg_info "Fixing wrong permissions" + chmod +x /opt/freshrss/cli/sensitive-log.sh + systemctl restart apache2 + msg_ok "Fixed wrong permissions" + exit + else + msg_error "FreshRSS should be updated via the user interface." + exit + fi } start diff --git a/ct/globaleaks.sh b/ct/globaleaks.sh index 9e37447b8..f8ed1df00 100644 --- a/ct/globaleaks.sh +++ b/ct/globaleaks.sh @@ -31,6 +31,7 @@ function update_script() { $STD apt update $STD apt -y upgrade msg_ok "Updated $APP LXC" + exit } start diff --git a/ct/lyrionmusicserver.sh b/ct/lyrionmusicserver.sh index 211850464..070b8d44d 100644 --- a/ct/lyrionmusicserver.sh +++ b/ct/lyrionmusicserver.sh @@ -50,6 +50,7 @@ function update_script() { else msg_ok "$APP is already up to date (${RELEASE})" fi + exit } start diff --git a/ct/oauth2-proxy.sh b/ct/oauth2-proxy.sh index 33ca28393..80c832b4a 100644 --- a/ct/oauth2-proxy.sh +++ b/ct/oauth2-proxy.sh @@ -40,6 +40,7 @@ function update_script() { msg_ok "Started Service" msg_ok "Updated successfully!\n" fi + exit } start diff --git a/ct/salt.sh b/ct/salt.sh index f6acc9baa..e7b331cfa 100644 --- a/ct/salt.sh +++ b/ct/salt.sh @@ -40,6 +40,7 @@ function update_script() { else msg_ok "${APP} is already up to date (${RELEASE})" fi + exit } start