Remove redundant cleanup steps from update scripts

Eliminated unnecessary 'Cleaning up' messages and duplicate cleanup commands from multiple service update scripts. Cleanup actions (such as removing backup files and temporary artifacts) are now performed directly without extra messaging, streamlining the update process and reducing log verbosity.

ct/2fauth.sh

@@ -57,15 +57,6 @@ function update_script() {
     $STD composer install --no-dev --prefer-dist
     php artisan 2fauth:install
     $STD systemctl restart nginx
-
-    msg_info "Cleaning Up"
-    if dpkg -l | grep -q 'php8.2'; then
-      $STD apt remove --purge -y php8.2*
-    fi
-    $STD apt -y autoremove
-    $STD apt -y autoclean
-    $STD apt -y clean
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/adventurelog.sh

@@ -62,6 +62,7 @@ function update_script() {
     cd /opt/adventurelog/frontend || exit
     $STD pnpm i
     $STD pnpm build
+    rm -rf /opt/adventurelog-backup
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Services"
@@ -69,10 +70,6 @@ function update_script() {
     systemctl start adventurelog-backend
     systemctl start adventurelog-frontend
     msg_ok "Services Started"
-
-    msg_info "Cleaning Up"
-    rm -rf /opt/adventurelog-backup
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/apache-tika.sh

@@ -38,15 +38,13 @@ function update_script() {
     curl -fsSL -o tika-server-standard-${RELEASE}.jar "https://dlcdn.apache.org/tika/${RELEASE}/tika-server-standard-${RELEASE}.jar"
     mv --force tika-server-standard.jar tika-server-standard-prev-version.jar
     mv tika-server-standard-${RELEASE}.jar tika-server-standard.jar
+    rm -rf /opt/apache-tika/tika-server-standard-prev-version.jar
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start apache-tika
     msg_ok "Started Service"
-    msg_info "Cleaning Up"
-    rm -rf /opt/apache-tika/tika-server-standard-prev-version.jar
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/authelia.sh

@@ -31,15 +31,11 @@ function update_script() {
   fi
 
   if check_for_gh_release "authelia" "authelia/authelia"; then
-    $STD apt-get update
+    $STD apt update
-    $STD apt-get -y upgrade
+    $STD apt -y upgrade
 
     fetch_and_deploy_gh_release "authelia" "authelia/authelia" "binary"
 
-    msg_info "Cleaning Up"
-    $STD apt-get -y autoremove
-    $STD apt-get -y autoclean
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/backrest.sh

@@ -39,16 +39,13 @@ function update_script() {
     curl -fsSL "https://github.com/garethgeorge/backrest/releases/download/v${RELEASE}/backrest_Linux_x86_64.tar.gz" -o "$temp_file"
     tar xzf $temp_file -C /opt/backrest/bin
     chmod +x /opt/backrest/bin/backrest
+    rm -f "$temp_file"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to ${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start backrest
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -f "$temp_file"
-    msg_ok "Cleaned up"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/baikal.sh

@@ -47,15 +47,12 @@ function update_script() {
     chmod -R 755 /opt/baikal/
     cd /opt/baikal
     $STD composer install
+    rm -rf /opt/baikal-backup
     msg_ok "Configured Baikal"
 
     msg_info "Starting Service"
     systemctl start apache2
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -rf /opt/baikal-backup
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/bar-assistant.sh

@@ -54,15 +54,12 @@ function update_script() {
     $STD php artisan route:cache
     $STD php artisan event:cache
     chown -R www-data:www-data /opt/bar-assistant
+    rm -rf /opt/bar-assistant-backup
     msg_ok "Updated Bar-Assistant"
 
     msg_info "Starting nginx"
     systemctl start nginx
     msg_ok "Started nginx"
-
-    msg_info "Cleaning up"
-    rm -rf /opt/bar-assistant-backup
-    msg_ok "Cleaned"
   fi
 
   if check_for_gh_release "vue-salt-rim" "karlomikus/vue-salt-rim"; then
@@ -81,15 +78,12 @@ function update_script() {
     cd /opt/vue-salt-rim
     $STD npm install
     $STD npm run build
+    rm -rf /opt/vue-salt-rim-backup
     msg_ok "Updated Vue Salt Rim"
 
     msg_info "Starting nginx"
     systemctl start nginx
     msg_ok "Started nginx"
-
-    msg_info "Cleaning up"
-    rm -rf /opt/vue-salt-rim-backup
-    msg_ok "Cleaned"
   fi
 
   if check_for_gh_release "meilisearch" "meilisearch/meilisearch"; then

ct/bookstack.sh

@@ -57,15 +57,12 @@ function update_script() {
     chmod -R 755 /opt/bookstack /opt/bookstack/bootstrap/cache /opt/bookstack/public/uploads /opt/bookstack/storage
     chmod -R 775 /opt/bookstack/storage /opt/bookstack/bootstrap/cache /opt/bookstack/public/uploads
     chmod -R 640 /opt/bookstack/.env
+    rm -rf /opt/bookstack-backup
     msg_ok "Configured BookStack"
 
     msg_info "Starting Apache2"
     systemctl start apache2
     msg_ok "Started Apache2"
-
-    msg_info "Cleaning Up"
-    rm -rf /opt/bookstack-backup
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/dispatcharr.sh

@@ -109,6 +109,7 @@ function update_script() {
     fi
     $STD uv run python manage.py migrate --noinput
     $STD uv run python manage.py collectstatic --noinput
+    rm -f /tmp/dispatcharr_db_*.sql
     msg_ok "Migrations Complete"
 
     msg_info "Starting Services"
@@ -117,10 +118,6 @@ function update_script() {
     systemctl start dispatcharr-celerybeat
     systemctl start dispatcharr-daphne
     msg_ok "Started Services"
-
-    msg_info "Cleaning up"
-    rm -f /tmp/dispatcharr_db_*.sql
-    msg_ok "Cleanup completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/docker.sh

@@ -76,11 +76,6 @@ function update_script() {
       portainer/agent
     msg_ok "Updated Portainer Agent"
   fi
-
-  msg_info "Cleaning up"
-  $STD apt-get -y autoremove
-  $STD apt-get -y autoclean
-  msg_ok "Cleanup complete"
   msg_ok "Updated successfully!"
   exit
 }

ct/documenso.sh

@@ -50,16 +50,13 @@ function update_script() {
     $STD turbo run build --filter=@documenso/remix
     $STD npm run prisma:migrate-deploy
     $STD turbo daemon stop
+    rm -rf /opt/v${RELEASE}.zip
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Service"
     systemctl start documenso
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -rf /opt/v${RELEASE}.zip
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/emqx.sh

@@ -47,16 +47,13 @@ function update_script() {
 
     msg_info "Installing EMQX"
     $STD apt-get install -y "$DEB_FILE"
+    rm -f "$DEB_FILE"
+    echo "$RELEASE" >~/.emqx
     msg_ok "Installed EMQX v${RELEASE}"
 
     msg_info "Starting EMQX"
     systemctl start emqx
-    echo "$RELEASE" >~/.emqx
     msg_ok "Started EMQX"
-
-    msg_info "Cleaning Up"
-    rm -f "$DEB_FILE"
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. EMQX is already at v${RELEASE}"

ct/fileflows.sh

@@ -48,16 +48,13 @@ function update_script() {
     temp_file=$(mktemp)
     curl -fsSL https://fileflows.com/downloads/zip -o "$temp_file"
     $STD unzip -o -d /opt/fileflows "$temp_file"
+    rm -rf "$temp_file"
+    rm -rf "$backup_filename"
     msg_ok "Updated $APP to latest version"
 
     msg_info "Starting Service"
     systemctl start fileflows
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -rf "$temp_file"
-    rm -rf "$backup_filename"
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at latest version"

ct/ghostfolio.sh

@@ -56,10 +56,6 @@ function update_script() {
     msg_info "Starting Service"
     systemctl start ghostfolio
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    $STD npm cache clean --force
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/jellyseerr.sh

@@ -20,62 +20,57 @@ color
 catch_errors
 
 function update_script() {
-    header_info
+  header_info
-    check_container_storage
+  check_container_storage
-    check_container_resources
+  check_container_resources
 
-    if [[ ! -d /opt/jellyseerr ]]; then
+  if [[ ! -d /opt/jellyseerr ]]; then
-        msg_error "No ${APP} Installation Found!"
+    msg_error "No ${APP} Installation Found!"
-        exit
+    exit
-    fi
+  fi
 
-    if [ "$(node -v | cut -c2-3)" -ne 22 ]; then
+  if [ "$(node -v | cut -c2-3)" -ne 22 ]; then
-        msg_info "Updating Node.js Repository"
+    msg_info "Updating Node.js Repository"
-        echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
+    echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_22.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
-        msg_ok "Updating Node.js Repository"
+    msg_ok "Updating Node.js Repository"
 
-        msg_info "Updating Packages"
+    msg_info "Updating Packages"
-        $STD apt-get update
+    $STD apt-get update
-        $STD apt-get -y upgrade
+    $STD apt-get -y upgrade
-        msg_ok "Updating Packages"
+    msg_ok "Updating Packages"
+  fi
 
-        msg_info "Cleaning up"
+  cd /opt/jellyseerr
-        apt-get -y autoremove
+  output=$(git pull --no-rebase)
-        apt-get -y autoclean
-        msg_ok "Cleaning up"
-    fi
 
-    cd /opt/jellyseerr
+  pnpm_current=$(pnpm --version 2>/dev/null)
-    output=$(git pull --no-rebase)
+  pnpm_desired=$(grep -Po '"pnpm":\s*"\K[^"]+' /opt/jellyseerr/package.json)
 
-    pnpm_current=$(pnpm --version 2>/dev/null)
+  if [ -z "$pnpm_current" ]; then
-    pnpm_desired=$(grep -Po '"pnpm":\s*"\K[^"]+' /opt/jellyseerr/package.json)
+    msg_error "pnpm not found. Installing version $pnpm_desired..."
+    NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" setup_nodejs
+  elif ! node -e "const semver = require('semver'); process.exit(semver.satisfies('$pnpm_current', '$pnpm_desired') ? 0 : 1)"; then
+    msg_error "Updating pnpm from version $pnpm_current to $pnpm_desired..."
+    NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" setup_nodejs
+  else
+    msg_ok "pnpm is already installed and satisfies version $pnpm_desired."
+  fi
 
-    if [ -z "$pnpm_current" ]; then
+  msg_info "Updating $APP"
-        msg_error "pnpm not found. Installing version $pnpm_desired..."
+  if echo "$output" | grep -q "Already up to date."; then
-        NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" setup_nodejs
+    msg_ok "$APP is already up to date."
-    elif ! node -e "const semver = require('semver'); process.exit(semver.satisfies('$pnpm_current', '$pnpm_desired') ? 0 : 1)"; then
+    exit
-        msg_error "Updating pnpm from version $pnpm_current to $pnpm_desired..."
+  fi
-        NODE_VERSION="22" NODE_MODULE="pnpm@$pnpm_desired" setup_nodejs
-    else
-        msg_ok "pnpm is already installed and satisfies version $pnpm_desired."
-    fi
 
-    msg_info "Updating $APP"
+  systemctl stop jellyseerr
-    if echo "$output" | grep -q "Already up to date."; then
+  rm -rf dist .next node_modules
-        msg_ok "$APP is already up to date."
+  export CYPRESS_INSTALL_BINARY=0
-        exit
+  cd /opt/jellyseerr
-    fi
+  $STD pnpm install --frozen-lockfile
+  export NODE_OPTIONS="--max-old-space-size=3072"
+  $STD pnpm build
 
-    systemctl stop jellyseerr
+  cat <<EOF >/etc/systemd/system/jellyseerr.service
-    rm -rf dist .next node_modules
-    export CYPRESS_INSTALL_BINARY=0
-    cd /opt/jellyseerr
-    $STD pnpm install --frozen-lockfile
-    export NODE_OPTIONS="--max-old-space-size=3072"
-    $STD pnpm build
-
-    cat <<EOF >/etc/systemd/system/jellyseerr.service
 [Unit]
 Description=jellyseerr Service
 After=network.target
@@ -91,10 +86,10 @@ ExecStart=/usr/bin/node dist/index.js
 WantedBy=multi-user.target
 EOF
 
-    systemctl daemon-reload
+  systemctl daemon-reload
-    systemctl start jellyseerr
+  systemctl start jellyseerr
-    msg_ok "Updated $APP"
+  msg_ok "Updated $APP"
-    exit
+  exit
 }
 
 start

ct/keycloak.sh

@@ -49,15 +49,12 @@ function update_script() {
     cp -a keycloak.old/conf/. keycloak/conf/
     cp -a keycloak.old/providers/. keycloak/providers/ 2>/dev/null || true
     cp -a keycloak.old/themes/. keycloak/themes/ 2>/dev/null || true
+    rm -rf keycloak.old
     msg_ok "Updated Keycloak"
 
     msg_info "Restarting Service"
     systemctl restart keycloak
     msg_ok "Restarted Service"
-
-    msg_info "Cleaning up"
-    rm -rf keycloak.old
-    msg_ok "Cleanup complete"
     msg_ok "Updated successfully!"
   fi
   exit

ct/koillection.sh

@@ -50,15 +50,12 @@ function update_script() {
     $STD yarn install
     $STD yarn build
     chown -R www-data:www-data /opt/koillection/public/uploads
+    rm -r /opt/koillection-backup
     msg_ok "Updated Koillection"
 
     msg_info "Starting Service"
     systemctl start apache2
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -r /opt/koillection-backup
-    msg_ok "Cleaned"
     msg_ok "Updated Successfully!"
   fi
   exit

ct/linkwarden.sh

@@ -52,17 +52,14 @@ function update_script() {
     $STD yarn web:build
     $STD yarn prisma:deploy
     [ -d /opt/data.bak ] && mv /opt/data.bak /opt/linkwarden/data
+    rm -rf ~/.cargo/registry ~/.cargo/git ~/.cargo/.package-cache ~/.rustup
+    rm -rf /root/.cache/yarn
+    rm -rf /opt/linkwarden/.next/cache
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Service"
     systemctl start linkwarden
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -rf ~/.cargo/registry ~/.cargo/git ~/.cargo/.package-cache ~/.rustup
-    rm -rf /root/.cache/yarn
-    rm -rf /opt/linkwarden/.next/cache
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/listmonk.sh

@@ -42,15 +42,12 @@ function update_script() {
     mv /opt/listmonk-backup/config.toml /opt/listmonk/config.toml
     mv /opt/listmonk-backup/uploads /opt/listmonk/uploads
     $STD /opt/listmonk/listmonk --upgrade --yes --config /opt/listmonk/config.toml
+    rm -rf /opt/listmonk-backup/
     msg_ok "Configured listmonk"
 
     msg_info "Starting Service"
     systemctl start listmonk
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -rf /opt/listmonk-backup/
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/lubelogger.sh

@@ -53,15 +53,12 @@ function update_script() {
     msg_info "Configuring LubeLogger"
     chmod 700 /opt/lubelogger/CarCareTracker
     cp -rf /tmp/lubeloggerData/* /opt/lubelogger/
+    rm -rf /tmp/lubeloggerData
     msg_ok "Configured LubeLogger"
 
     msg_info "Starting Service"
     systemctl start lubelogger
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -rf /tmp/lubeloggerData
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/lyrionmusicserver.sh

@@ -38,15 +38,9 @@ function update_script() {
     curl -fsSL -o "$DEB_FILE" "$DEB_URL"
     $STD apt install "$DEB_FILE" -y
     systemctl restart lyrion
+    $STD rm -f "$DEB_FILE"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to ${RELEASE}"
-
-    msg_info "Cleaning up"
-    $STD rm -f "$DEB_FILE"
-    $STD apt -y autoremove
-    $STD apt -y autoclean
-    $STD apt -y clean
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "$APP is already up to date (${RELEASE})"

ct/minio.sh

@@ -55,17 +55,13 @@ function update_script() {
     mv /usr/local/bin/minio /usr/local/bin/minio_bak
     curl -fsSL "https://dl.min.io/server/minio/release/linux-amd64/minio" -o /usr/local/bin/minio
     chmod +x /usr/local/bin/minio
+    rm -f /usr/local/bin/minio_bak
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Service"
     systemctl start minio
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -f /usr/local/bin/minio_bak
-    msg_ok "Cleaned"
-
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/monica.sh

@@ -52,15 +52,12 @@ function update_script() {
     $STD php artisan monica:update --force
     chown -R www-data:www-data /opt/monica
     chmod -R 775 /opt/monica/storage
+    rm -r /opt/monica-backup
     msg_ok "Configured monica"
 
     msg_info "Starting Service"
     systemctl start apache2
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -r /opt/monica-backup
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/netbox.sh

@@ -57,17 +57,14 @@ function update_script() {
     fi
 
     $STD /opt/netbox/upgrade.sh
+    rm -r "/opt/v${RELEASE}.zip"
+    rm -r /opt/netbox-backup
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start netbox netbox-rq
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -r "/opt/v${RELEASE}.zip"
-    rm -r /opt/netbox-backup
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/nextpvr.sh

@@ -21,37 +21,34 @@ color
 catch_errors
 
 function update_script() {
-    header_info
+  header_info
-    check_container_storage
+  check_container_storage
-    check_container_resources
+  check_container_resources
-    if [[ ! -d /opt/nextpvr ]]; then
+  if [[ ! -d /opt/nextpvr ]]; then
-        msg_error "No ${APP} Installation Found!"
+    msg_error "No ${APP} Installation Found!"
-        exit
-    fi
-    msg_info "Stopping Service"
-    systemctl stop nextpvr-server
-    msg_ok "Stopped Service"
-
-    msg_info "Updating LXC packages"
-    $STD apt update
-    $STD apt -y upgrade
-    msg_ok "Updated LXC packages"
-
-    msg_info "Updating ${APP}"
-    cd /opt
-    curl -fsSL "https://nextpvr.com/nextpvr-helper.deb" -o $(basename "https://nextpvr.com/nextpvr-helper.deb")
-    $STD dpkg -i nextpvr-helper.deb
-    msg_ok "Updated ${APP}"
-
-    msg_info "Starting Service"
-    systemctl start nextpvr-server
-    msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -rf /opt/nextpvr-helper.deb
-    msg_ok "Cleaned"
-    msg_ok "Updated successfully!"
     exit
+  fi
+  msg_info "Stopping Service"
+  systemctl stop nextpvr-server
+  msg_ok "Stopped Service"
+
+  msg_info "Updating LXC packages"
+  $STD apt update
+  $STD apt -y upgrade
+  msg_ok "Updated LXC packages"
+
+  msg_info "Updating ${APP}"
+  cd /opt
+  curl -fsSL "https://nextpvr.com/nextpvr-helper.deb" -o $(basename "https://nextpvr.com/nextpvr-helper.deb")
+  $STD dpkg -i nextpvr-helper.deb
+  rm -rf /opt/nextpvr-helper.deb
+  msg_ok "Updated ${APP}"
+
+  msg_info "Starting Service"
+  systemctl start nextpvr-server
+  msg_ok "Started Service"
+  msg_ok "Updated successfully!"
+  exit
 }
 
 start

ct/nxwitness.sh

@@ -42,17 +42,13 @@ function update_script() {
     export DEBIAN_FRONTEND=noninteractive
     export DEBCONF_NOWARNINGS=yes
     $STD dpkg -i nxwitness-server-$RELEASE-linux_x64.deb
+    rm -f /tmp/nxwitness-server-$RELEASE-linux_x64.deb
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Service"
     systemctl start networkoptix-root-tool networkoptix-mediaserver
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -f /tmp/nxwitness-server-$RELEASE-linux_x64.deb
-    msg_ok "Cleaned"
-
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/odoo.sh

@@ -50,17 +50,13 @@ function update_script() {
     msg_info "Updating ${APP} to ${LATEST_VERSION}"
     curl -fsSL https://nightly.odoo.com/${RELEASE}/nightly/deb/odoo_${RELEASE}.latest_all.deb -o /opt/odoo.deb
     $STD apt install -y /opt/odoo.deb
+    rm -f /opt/odoo.deb
     echo "$LATEST_VERSION" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to ${LATEST_VERSION}"
 
-    msg_info "Starting ${APP} service"
+    msg_info "Starting Service"
     systemctl start odoo
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -f /opt/odoo.deb
-    msg_ok "Cleaned"
-
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${LATEST_VERSION}"

ct/ollama.sh

@@ -43,16 +43,13 @@ function update_script() {
     mkdir -p /usr/local/lib/ollama
     tar -xzf "${TMP_TAR}" -C /usr/local/lib/ollama
     ln -sf /usr/local/lib/ollama/bin/ollama /usr/local/bin/ollama
+    rm -f "${TMP_TAR}"
     echo "${RELEASE}" >/opt/Ollama_version.txt
     msg_ok "Updated Ollama to ${RELEASE}"
 
     msg_info "Starting Services"
     systemctl start ollama
     msg_ok "Started Services"
-
-    msg_info "Cleaning Up"
-    rm -f "${TMP_TAR}"
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. Ollama is already at ${RELEASE}"

ct/onedev.sh

@@ -39,17 +39,14 @@ function update_script() {
     tar -xzf onedev-latest.tar.gz
     $STD /opt/onedev-latest/bin/upgrade.sh /opt/onedev
     RELEASE=$(cat /opt/onedev/release.properties | grep "version" | cut -d'=' -f2)
+    rm -rf /opt/onedev-latest
+    rm -rf /opt/onedev-latest.tar.gz
     echo "${RELEASE}" >"/opt/${APP}_version.txt"
     msg_ok "Updated ${APP} to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start onedev
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -rf /opt/onedev-latest
-    rm -rf /opt/onedev-latest.tar.gz
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}."

ct/paperless-ai.sh

@@ -65,17 +65,14 @@ EOF
     $STD pip install --no-cache-dir -r requirements.txt
     mkdir -p data/chromadb
     $STD npm install
+    rm -rf /opt/v${RELEASE}.zip
+    rm -rf /opt/paperless-ai_bak
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start paperless-ai
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -rf /opt/v${RELEASE}.zip
-    rm -rf /opt/paperless-ai_bak
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/paperless-gpt.sh

@@ -20,48 +20,45 @@ color
 catch_errors
 
 function update_script() {
-    header_info
+  header_info
-    check_container_storage
+  check_container_storage
-    check_container_resources
+  check_container_resources
-    if [[ ! -d /opt/paperless-gpt ]]; then
+  if [[ ! -d /opt/paperless-gpt ]]; then
-        msg_error "No Paperless-GPT installation found!"
+    msg_error "No Paperless-GPT installation found!"
-        exit
-    fi
-    RELEASE=$(curl -fsSL https://api.github.com/repos/icereed/paperless-gpt/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
-    if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
-        msg_info "Stopping Service"
-        systemctl stop paperless-gpt
-        msg_ok "Service Stopped"
-
-        msg_info "Updating Paperless-GPT to ${RELEASE}"
-        temp_file=$(mktemp)
-        curl -fsSL "https://github.com/icereed/paperless-gpt/archive/refs/tags/v${RELEASE}.tar.gz" -o "$temp_file"
-        tar zxf $temp_file
-        rm -rf /opt/paperless-gpt
-        mv paperless-gpt-${RELEASE} /opt/paperless-gpt
-        cd /opt/paperless-gpt/web-app
-        $STD npm install
-        $STD npm run build
-        cd /opt/paperless-gpt
-        go mod download
-        export CC=musl-gcc
-        CGO_ENABLED=1 go build -tags musl -o /dev/null github.com/mattn/go-sqlite3
-        CGO_ENABLED=1 go build -tags musl -o paperless-gpt .
-        echo "${RELEASE}" >"/opt/paperless-gpt_version.txt"
-        msg_ok "Updated Paperless-GPT to ${RELEASE}"
-
-        msg_info "Starting Service"
-        systemctl start paperless-gpt
-        msg_ok "Started Service"
-
-        msg_info "Cleaning Up"
-        rm -f $temp_file
-        msg_ok "Cleanup Completed"
-        msg_ok "Updated successfully!"
-    else
-        msg_ok "No update required. ${APP} is already at ${RELEASE}"
-    fi
     exit
+  fi
+  RELEASE=$(curl -fsSL https://api.github.com/repos/icereed/paperless-gpt/releases/latest | grep "tag_name" | awk '{print substr($2, 3, length($2)-4) }')
+  if [[ ! -f /opt/${APP}_version.txt ]] || [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]]; then
+    msg_info "Stopping Service"
+    systemctl stop paperless-gpt
+    msg_ok "Service Stopped"
+
+    msg_info "Updating Paperless-GPT to ${RELEASE}"
+    temp_file=$(mktemp)
+    curl -fsSL "https://github.com/icereed/paperless-gpt/archive/refs/tags/v${RELEASE}.tar.gz" -o "$temp_file"
+    tar zxf $temp_file
+    rm -rf /opt/paperless-gpt
+    mv paperless-gpt-${RELEASE} /opt/paperless-gpt
+    cd /opt/paperless-gpt/web-app
+    $STD npm install
+    $STD npm run build
+    cd /opt/paperless-gpt
+    go mod download
+    export CC=musl-gcc
+    CGO_ENABLED=1 go build -tags musl -o /dev/null github.com/mattn/go-sqlite3
+    CGO_ENABLED=1 go build -tags musl -o paperless-gpt .
+    rm -f $temp_file
+    echo "${RELEASE}" >"/opt/paperless-gpt_version.txt"
+    msg_ok "Updated Paperless-GPT to ${RELEASE}"
+
+    msg_info "Starting Service"
+    systemctl start paperless-gpt
+    msg_ok "Started Service"
+    msg_ok "Updated successfully!"
+  else
+    msg_ok "No update required. ${APP} is already at ${RELEASE}"
+  fi
+  exit
 }
 
 start

ct/part-db.sh

@@ -52,17 +52,14 @@ function update_script() {
     $STD php bin/console cache:clear
     $STD php bin/console doctrine:migrations:migrate -n
     chown -R www-data:www-data /opt/partdb
+    rm -r "/opt/v${RELEASE}.zip"
+    rm -r /opt/partdb-backup
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start apache2
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -r "/opt/v${RELEASE}.zip"
-    rm -r /opt/partdb-backup
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/pelican-panel.sh

@@ -67,6 +67,7 @@ function update_script() {
     $STD php artisan migrate --seed --force
     chown -R www-data:www-data /opt/pelican-panel
     chmod -R 755 /opt/pelican-panel/storage /opt/pelican-panel/bootstrap/cache/
+    rm -rf "/opt/pelican-panel/panel.tar.gz"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
@@ -74,10 +75,6 @@ function update_script() {
     $STD php artisan queue:restart
     $STD php artisan up
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -rf "/opt/pelican-panel/panel.tar.gz"
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/pterodactyl-panel.sh

@@ -70,6 +70,7 @@ EOF
     $STD php artisan migrate --seed --force --no-interaction
     chown -R www-data:www-data /opt/pterodactyl-panel/*
     chmod -R 755 /opt/pterodactyl-panel/storage /opt/pterodactyl-panel/bootstrap/cache/
+    rm -rf "/opt/pterodactyl-panel/panel.tar.gz"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
@@ -77,10 +78,6 @@ EOF
     $STD php artisan queue:restart
     $STD php artisan up
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -rf "/opt/pterodactyl-panel/panel.tar.gz"
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/rdtclient.sh

@@ -43,14 +43,11 @@ function update_script() {
       $STD apt remove --purge -y dotnet-sdk-8.0
       $STD apt install -y dotnet-sdk-9.0
     fi
+    rm -rf /opt/rdtc-backup
 
     msg_info "Starting Service"
     systemctl start rdtc
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -rf /opt/rdtc-backup
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/reactive-resume.sh

@@ -54,6 +54,7 @@ function update_script() {
     cd /tmp
     curl -fsSL https://dl.min.io/server/minio/release/linux-amd64/minio.deb -o minio.deb
     $STD dpkg -i minio.deb
+    rm -f /tmp/minio.deb
     msg_ok "Updated Minio"
 
     msg_info "Updating Browserless (Patience)"
@@ -75,16 +76,12 @@ function update_script() {
     $STD npm run build:function
     $STD npm prune production
     mv /opt/browserless.env /opt/browserless/.env
+    rm -f "$brwsr_tmp"
     msg_ok "Updated Browserless"
 
     msg_info "Restarting services"
     systemctl start minio Reactive-Resume browserless
     msg_ok "Restarted services"
-
-    msg_info "Cleaning Up"
-    rm -f /tmp/minio.deb
-    rm -f "$brwsr_tmp"
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/revealjs.sh

@@ -41,15 +41,12 @@ function update_script() {
     $STD npm install
     cp -f /opt/index.html /opt/revealjs
     sed -i '25s/localhost/0.0.0.0/g' /opt/revealjs/gulpfile.js
+    rm -f /opt/index.html
     msg_ok "Updated $APP"
 
     msg_info "Starting Service"
     systemctl start revealjs
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -f /opt/index.html
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/slskd.sh

@@ -61,15 +61,12 @@ function update_script() {
   $STD pip install -r requirements.txt
   mv /opt/config.ini.bak /opt/soularr/config.ini
   mv /opt/run.sh.bak /opt/soularr/run.sh
+  rm -rf /tmp/main.zip
   msg_ok "Updated soularr"
 
   msg_info "Starting soularr timer"
   systemctl start soularr.timer
   msg_ok "Started soularr timer"
-
-  msg_info "Cleaning Up"
-  rm -rf /tmp/main.zip
-  msg_ok "Cleanup Completed"
   exit
 }
 

ct/spoolman.sh

@@ -43,17 +43,13 @@ function update_script() {
     cd spoolman
     $STD pip3 install -r requirements.txt
     curl -fsSL "https://raw.githubusercontent.com/Donkie/Spoolman/master/.env.example" -o ".env"
+    rm -rf /opt/spoolman.zip
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP} to ${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start spoolman
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -rf /opt/spoolman.zip
-    msg_ok "Cleaned"
-
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/tandoor.sh

@@ -64,16 +64,13 @@ EOF
     cd /opt/tandoor
     $STD /opt/tandoor/.venv/bin/python manage.py migrate
     $STD /opt/tandoor/.venv/bin/python manage.py collectstatic --no-input
+    rm -rf /opt/tandoor.bak
     msg_ok "Updated Trandoor"
 
     msg_info "Starting Service"
     systemctl start tandoor
     systemctl reload nginx
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -rf /opt/tandoor.bak
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/tasmocompiler.sh

@@ -45,16 +45,13 @@ function update_script() {
     export NODE_OPTIONS=--openssl-legacy-provider
     $STD npm i
     $STD yarn build
+    rm -r "/opt/v${RELEASE}.tar.gz"
+    echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated TasmoCompiler"
 
     msg_info "Starting Service"
     systemctl start tasmocompiler
     msg_ok "Started Service"
-
-    echo "${RELEASE}" >/opt/${APP}_version.txt
-    msg_info "Cleaning up"
-    rm -r "/opt/v${RELEASE}.tar.gz"
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/tdarr.sh

@@ -37,11 +37,8 @@ function update_script() {
   $STD unzip Tdarr_Updater.zip
   chmod +x Tdarr_Updater
   $STD ./Tdarr_Updater
-  msg_ok "Updated Tdarr"
-
-  msg_info "Cleaning up"
   rm -rf /opt/tdarr/Tdarr_Updater.zip
-  msg_ok "Cleaned up"
+  msg_ok "Updated Tdarr"
   msg_ok "Updated successfully!"
   exit
 }

ct/technitiumdns.sh

@@ -38,11 +38,8 @@ function update_script() {
     msg_info "Updating Technitium DNS"
     curl -fsSL "https://download.technitium.com/dns/DnsServerPortable.tar.gz" -o /opt/DnsServerPortable.tar.gz
     $STD tar zxvf /opt/DnsServerPortable.tar.gz -C /opt/technitium/dns/
-    msg_ok "Updated Technitium DNS"
-
-    msg_info "Cleaning up"
     rm -f /opt/DnsServerPortable.tar.gz
-    msg_ok "Cleaned up"
+    msg_ok "Updated Technitium DNS"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required.  Technitium DNS is already at v${RELEASE}."

ct/teddycloud.sh

@@ -41,15 +41,12 @@ function update_script() {
 
     msg_info "Restoring data"
     cp -R /opt/teddycloud_bak/certs /opt/teddycloud_bak/config /opt/teddycloud_bak/data /opt/teddycloud
+    rm -rf /opt/teddycloud_bak
     msg_ok "Data restored"
 
     msg_info "Starting Service"
     systemctl start teddycloud
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -rf /opt/teddycloud_bak
-    msg_ok "Cleaned up"
     msg_ok "Updated successfully!"
   fi
   exit

ct/tianji.sh

@@ -43,7 +43,7 @@ function update_script() {
 
     fetch_and_deploy_gh_release "tianji" "msgbyte/tianji"
 
-    msg_info "Updating ${APP}"
+    msg_info "Updating Tianji"
     cd /opt/tianji
     export NODE_OPTIONS="--max_old_space_size=4096"
     $STD pnpm install --filter @tianji/client... --config.dedupe-peer-dependents=false --frozen-lockfile
@@ -55,7 +55,11 @@ function update_script() {
     mv /opt/.env /opt/tianji/src/server/.env
     cd src/server
     $STD pnpm db:migrate:apply
-    msg_ok "Updated ${APP}"
+    rm -rf /opt/tianji_bak
+    rm -rf /opt/tianji/src/client
+    rm -rf /opt/tianji/website
+    rm -rf /opt/tianji/reporter
+    msg_ok "Updated Tianji"
 
     msg_info "Updating AppRise"
     $STD uv pip install apprise cryptography --system
@@ -64,13 +68,6 @@ function update_script() {
     msg_info "Starting Service"
     systemctl start tianji
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -rf /opt/tianji_bak
-    rm -rf /opt/tianji/src/client
-    rm -rf /opt/tianji/website
-    rm -rf /opt/tianji/reporter
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/traccar.sh

@@ -50,18 +50,12 @@ function update_script() {
     mv /opt/traccar.xml /opt/traccar/conf
     [[ -d /opt/data ]] && mv /opt/data /opt/traccar
     [[ -d /opt/media ]] && mv /opt/media /opt/traccar
+    [ -f README.txt ] || [ -f traccar.run ] && rm -f README.txt traccar.run
     msg_ok "Data restored"
 
     msg_info "Starting Service"
     systemctl start traccar
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    [ -f README.txt ] || [ -f traccar.run ] && rm -f README.txt traccar.run
-    $STD apt -y autoremove
-    $STD apt -y autoclean
-    $STD apt -y clean
-    msg_ok "Cleaned up"
     msg_ok "Updated successfully!"
   fi
   exit

ct/trilium.sh

@@ -55,14 +55,8 @@ function update_script() {
     msg_info "Restoring Database"
     mkdir -p "$(dirname "${DB_RESTORE_PATH}")"
     cp -r /opt/trilium_backup/$(basename "${DB_PATH}") "${DB_RESTORE_PATH}"
-    msg_ok "Restored Database"
-
-    msg_info "Cleaning up"
     rm -rf /opt/trilium_backup
-    $STD apt -y autoremove
+    msg_ok "Restored Database"
-    $STD apt -y autoclean
-    $STD apt -y clean
-    msg_ok "Cleaned"
 
     msg_info "Starting Service"
     systemctl start trilium

ct/uhf.sh

@@ -43,12 +43,6 @@ function update_script() {
     msg_info "Starting Service"
     systemctl start uhf-server
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    $STD apt -y autoremove
-    $STD apt -y autoclean
-    $STD apt -y clean
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   fi
   exit

ct/vaultwarden.sh

@@ -57,11 +57,8 @@ function update_script() {
     else
       cp target/release/vaultwarden /opt/vaultwarden/bin/
     fi
-    msg_ok "Updated VaultWarden"
-
-    msg_info "Cleaning up"
     cd ~ && rm -rf vaultwarden
-    msg_ok "Cleaned"
+    msg_ok "Updated VaultWarden"
 
     msg_info "Starting Service"
     systemctl start vaultwarden
@@ -77,11 +74,8 @@ function update_script() {
     msg_info "Updating Web-Vault to $WVRELEASE"
     $STD curl -fsSLO https://github.com/dani-garcia/bw_web_builds/releases/download/"$WVRELEASE"/bw_web_"$WVRELEASE".tar.gz
     $STD tar -zxf bw_web_"$WVRELEASE".tar.gz -C /opt/vaultwarden/
-    msg_ok "Updated Web-Vault"
-
-    msg_info "Cleaning up"
     rm bw_web_"$WVRELEASE".tar.gz
-    msg_ok "Cleaned"
+    msg_ok "Updated Web-Vault"
 
     msg_info "Starting Service"
     systemctl start vaultwarden

ct/vikunja.sh

@@ -39,16 +39,13 @@ function update_script() {
     curl -fsSL "https://dl.vikunja.io/vikunja/$RELEASE/vikunja-$RELEASE-amd64.deb" -o $(basename "https://dl.vikunja.io/vikunja/$RELEASE/vikunja-$RELEASE-amd64.deb")
     export DEBIAN_FRONTEND=noninteractive
     $STD dpkg -i vikunja-"$RELEASE"-amd64.deb
+    rm -rf /opt/vikunja-"$RELEASE"-amd64.deb
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated ${APP}"
 
     msg_info "Starting Service"
     systemctl start vikunja
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -rf /opt/vikunja-"$RELEASE"-amd64.deb
-    msg_ok "Cleaned"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at ${RELEASE}"

ct/wastebin.sh

@@ -73,16 +73,13 @@ EOF
     cp -f wastebin* /opt/wastebin/
     chmod +x /opt/wastebin/wastebin
     chmod +x /opt/wastebin/wastebin-ctl
+    rm -f "$temp_file"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated Wastebin"
 
     msg_info "Starting Wastebin"
     systemctl start wastebin
     msg_ok "Started Wastebin"
-
-    msg_info "Cleaning Up"
-    rm -f "$temp_file"
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/watchyourlan.sh

@@ -37,10 +37,7 @@ function update_script() {
     fetch_and_deploy_gh_release "watchyourlan" "aceberg/WatchYourLAN" "binary"
     cp -R config.yaml /data/config.yaml
     sed -i 's|/etc/watchyourlan/config.yaml|/data/config.yaml|' /lib/systemd/system/watchyourlan.service
-
-    msg_info "Cleaning up"
     rm ~/config.yaml
-    msg_ok "Cleaned up"
 
     msg_info "Starting service"
     systemctl enable -q --now watchyourlan

ct/wger.sh

@@ -45,16 +45,13 @@ function update_script() {
     $STD python3 manage.py collectstatic --no-input
     $STD yarn install
     $STD yarn build:css:sass
+    rm -rf "$temp_file"
     echo "${RELEASE}" >/opt/${APP}_version.txt
     msg_ok "Updated $APP to v${RELEASE}"
 
     msg_info "Starting Service"
     systemctl start wger
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -rf "$temp_file"
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   else
     msg_ok "No update required. ${APP} is already at v${RELEASE}"

ct/wikijs.sh

@@ -54,15 +54,12 @@ function update_script() {
     msg_info "Restoring Data"
     cp -R /opt/wikijs-backup/* /opt/wikijs
     $SQLITE_INSTALL && $STD npm rebuild sqlite3
+    rm -rf /opt/wikijs-backup
     msg_ok "Restored Data"
 
     msg_info "Starting Service"
     systemctl start wikijs
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -rf /opt/wikijs-backup
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/wizarr.sh

@@ -56,15 +56,12 @@ function update_script() {
     if ! grep -q 'frozen' /opt/wizarr/start.sh; then
       sed -i 's/run/& --frozen/' /opt/wizarr/start.sh
     fi
+    rm -rf "$BACKUP_FILE"
     msg_ok "Updated Wizarr"
 
     msg_info "Starting Service"
     systemctl start wizarr
     msg_ok "Started Service"
-
-    msg_info "Cleaning Up"
-    rm -rf "$BACKUP_FILE"
-    msg_ok "Cleanup Completed"
     msg_ok "Updated successfully!"
   fi
   exit

ct/zabbix.sh

@@ -59,6 +59,7 @@ function update_script() {
     xargs -I{} echo "https://repo.zabbix.com/zabbix/{}/release/debian/pool/main/z/zabbix-release/zabbix-release_latest+debian13_all.deb")" \
     -o /tmp/zabbix-release_latest+debian13_all.deb
   $STD dpkg -i zabbix-release_latest+debian13_all.deb
+  rm -rf /tmp/zabbix-release_latest+debian13_all.deb
   $STD apt update
 
   $STD apt install --only-upgrade zabbix-server-pgsql zabbix-frontend-php php8.4-pgsql
@@ -88,13 +89,6 @@ function update_script() {
   systemctl start "$AGENT_SERVICE"
   systemctl restart apache2
   msg_ok "Started Services"
-
-  msg_info "Cleaning Up"
-  rm -rf /tmp/zabbix-release_latest+debian13_all.deb
-  $STD apt -y autoremove
-  $STD apt -y autoclean
-  $STD apt -y clean
-  msg_ok "Cleaned"
   msg_ok "Updated successfully!"
   exit
 }

ct/zigbee2mqtt.sh

@@ -47,18 +47,15 @@ function update_script() {
     rm -rf /opt/zigbee2mqtt/data
     mv /opt/z2m_backup/data /opt/zigbee2mqtt
     cd /opt/zigbee2mqtt
-    grep -q "^packageImportMethod" ./pnpm-workspace.yaml || echo "packageImportMethod: hardlink" >> ./pnpm-workspace.yaml
+    grep -q "^packageImportMethod" ./pnpm-workspace.yaml || echo "packageImportMethod: hardlink" >>./pnpm-workspace.yaml
     $STD pnpm install --frozen-lockfile
     $STD pnpm build
+    rm -rf /opt/z2m_backup
     msg_ok "Updated Zigbee2MQTT"
 
     msg_info "Starting Service"
     systemctl start zigbee2mqtt
     msg_ok "Started Service"
-
-    msg_info "Cleaning up"
-    rm -rf /opt/z2m_backup
-    msg_ok "Cleaned up"
     msg_ok "Updated successfully!"
   fi
   exit

frontend/public/json/versions.json

@@ -1,4 +1,44 @@
 [
+  {
+    "name": "pocketbase/pocketbase",
+    "version": "v0.34.0",
+    "date": "2025-11-22T09:18:14Z"
+  },
+  {
+    "name": "laurent22/joplin",
+    "version": "server-v3.4.4",
+    "date": "2025-09-25T13:19:26Z"
+  },
+  {
+    "name": "zwave-js/zwave-js-ui",
+    "version": "v11.8.0",
+    "date": "2025-11-22T07:54:42Z"
+  },
+  {
+    "name": "inventree/InvenTree",
+    "version": "1.1.5",
+    "date": "2025-11-22T07:02:52Z"
+  },
+  {
+    "name": "Jackett/Jackett",
+    "version": "v0.24.339",
+    "date": "2025-11-22T06:05:53Z"
+  },
+  {
+    "name": "theonedev/onedev",
+    "version": "v13.1.0",
+    "date": "2025-11-22T04:29:25Z"
+  },
+  {
+    "name": "jeedom/core",
+    "version": "4.4.20",
+    "date": "2025-11-22T00:27:05Z"
+  },
+  {
+    "name": "steveiliop56/tinyauth",
+    "version": "v4.0.1",
+    "date": "2025-10-15T16:53:55Z"
+  },
   {
     "name": "TwiN/gatus",
     "version": "v5.33.0",
@@ -9,11 +49,6 @@
     "version": "v1.78.5-stable-patch-1",
     "date": "2025-11-21T19:57:45Z"
   },
-  {
-    "name": "laurent22/joplin",
-    "version": "server-v3.4.4",
-    "date": "2025-09-25T13:19:26Z"
-  },
   {
     "name": "homarr-labs/homarr",
     "version": "v1.44.0",
@@ -29,6 +64,11 @@
     "version": "v1.72.0",
     "date": "2025-11-21T18:20:58Z"
   },
+  {
+    "name": "keycloak/keycloak",
+    "version": "26.4.5",
+    "date": "2025-11-12T15:24:23Z"
+  },
   {
     "name": "readeck/readeck",
     "version": "0.21.1",
@@ -49,11 +89,6 @@
     "version": "v5.6.1",
     "date": "2025-11-21T16:51:21Z"
   },
-  {
-    "name": "steveiliop56/tinyauth",
-    "version": "v4.0.1",
-    "date": "2025-10-15T16:53:55Z"
-  },
   {
     "name": "BookStackApp/BookStack",
     "version": "v25.11.3",
@@ -124,26 +159,21 @@
     "version": "v1.5.3",
     "date": "2025-09-20T12:12:33Z"
   },
-  {
-    "name": "Jackett/Jackett",
-    "version": "v0.24.338",
-    "date": "2025-11-21T05:55:33Z"
-  },
   {
     "name": "bluenviron/mediamtx",
     "version": "v1.15.4",
     "date": "2025-11-21T01:21:03Z"
   },
-  {
-    "name": "jeedom/core",
-    "version": "4.4.20",
-    "date": "2025-11-21T00:27:06Z"
-  },
   {
     "name": "TasmoAdmin/TasmoAdmin",
     "version": "v4.3.2",
     "date": "2025-10-18T12:11:00Z"
   },
+  {
+    "name": "ollama/ollama",
+    "version": "v0.13.1-rc0",
+    "date": "2025-11-20T21:30:35Z"
+  },
   {
     "name": "project-zot/zot",
     "version": "v2.1.11",
@@ -154,11 +184,6 @@
     "version": "v3007.9",
     "date": "2025-11-20T17:58:32Z"
   },
-  {
-    "name": "keycloak/keycloak",
-    "version": "26.4.5",
-    "date": "2025-11-12T15:24:23Z"
-  },
   {
     "name": "msgbyte/tianji",
     "version": "v1.30.12",
@@ -284,11 +309,6 @@
     "version": "2025.5",
     "date": "2025-11-19T14:48:47Z"
   },
-  {
-    "name": "ollama/ollama",
-    "version": "v0.13.0",
-    "date": "2025-11-19T14:16:07Z"
-  },
   {
     "name": "AdguardTeam/AdGuardHome",
     "version": "v0.107.69",
@@ -359,11 +379,6 @@
     "version": "v0.28.2",
     "date": "2025-11-18T05:51:46Z"
   },
-  {
-    "name": "theonedev/onedev",
-    "version": "v13.1.0",
-    "date": "2025-11-18T00:06:49Z"
-  },
   {
     "name": "ipfs/kubo",
     "version": "v0.38.2",
@@ -524,11 +539,6 @@
     "version": "v1.7.7",
     "date": "2025-11-13T21:28:44Z"
   },
-  {
-    "name": "pocketbase/pocketbase",
-    "version": "v0.33.0",
-    "date": "2025-11-13T14:09:14Z"
-  },
   {
     "name": "PrivateBin/PrivateBin",
     "version": "1.7.9",
@@ -549,11 +559,6 @@
     "version": "v1.0.25",
     "date": "2025-11-12T16:57:54Z"
   },
-  {
-    "name": "zwave-js/zwave-js-ui",
-    "version": "v11.7.0",
-    "date": "2025-11-12T14:09:36Z"
-  },
   {
     "name": "cockpit-project/cockpit",
     "version": "351",
@@ -654,11 +659,6 @@
     "version": "3.5.1",
     "date": "2025-11-09T05:09:28Z"
   },
-  {
-    "name": "inventree/InvenTree",
-    "version": "1.1.3",
-    "date": "2025-11-09T00:28:21Z"
-  },
   {
     "name": "raydak-labs/configarr",
     "version": "v1.17.2",

install/phpipam-install.sh

@@ -17,7 +17,7 @@ msg_info "Installing Dependencies"
 $STD apt install -y fping
 msg_ok "Installed Dependencies"
 
-PHP_VERSION="8.3" PHP_APACHE="YES" PHP_FPM="YES" PHP_MODULE="mysql,gmp,snmp,ldap,apcu" setup_php
+PHP_VERSION="8.3" PHP_APACHE="YES" PHP_FPM="YES" PHP_MODULE="pdo,pdo-mysql,gmp,snmp,ldap,apcu" setup_php
 
 msg_info "Installing PHP-PEAR"
 $STD apt install -y \

misc/tools.func

@@ -3628,63 +3628,39 @@ function setup_php() {
   local CURRENT_PHP=""
   CURRENT_PHP=$(is_tool_installed "php" 2>/dev/null) || true
 
-  # Scenario 1: Already at target version - just update packages
+  # CRITICAL: If wrong version is installed, remove it FIRST before any pinning
-  if [[ -n "$CURRENT_PHP" && "$CURRENT_PHP" == "$PHP_VERSION" ]]; then
+  if [[ -n "$CURRENT_PHP" && "$CURRENT_PHP" != "$PHP_VERSION" ]]; then
-    msg_info "Update PHP $PHP_VERSION"
+    msg_info "Removing conflicting PHP ${CURRENT_PHP} (need ${PHP_VERSION})"
+    stop_all_services "php.*-fpm"
+    $STD apt-get purge -y "php*" 2>/dev/null || true
+    $STD apt-get autoremove -y 2>/dev/null || true
+  fi
 
-    # Ensure Sury repo is available
+  # NOW create pinning for the desired version
-    if [[ ! -f /etc/apt/sources.list.d/php.sources ]]; then
+  mkdir -p /etc/apt/preferences.d
-      manage_tool_repository "php" "$PHP_VERSION" "" "https://packages.sury.org/debsuryorg-archive-keyring.deb" || {
+  cat <<EOF >/etc/apt/preferences.d/php-pin
-        msg_error "Failed to setup PHP repository"
-        return 1
-      }
-    fi
-
-    ensure_apt_working || return 1
-
-    # Perform upgrade with retry logic (non-fatal if fails)
-    upgrade_packages_with_retry "php${PHP_VERSION}" || true
-
-    cache_installed_version "php" "$PHP_VERSION"
-    msg_ok "Update PHP $PHP_VERSION"
-  else
-    # Scenario 2: Different version installed - clean upgrade
-    if [[ -n "$CURRENT_PHP" && "$CURRENT_PHP" != "$PHP_VERSION" ]]; then
-      msg_info "Upgrade PHP from $CURRENT_PHP to $PHP_VERSION"
-      # Stop and disable ALL PHP-FPM versions
-      stop_all_services "php.*-fpm"
-      remove_old_tool_version "php"
-    else
-      msg_info "Setup PHP $PHP_VERSION"
-    fi
-
-    # Prepare repository (cleanup + validation)
-    prepare_repository_setup "php" "deb.sury.org-php" || {
-      msg_error "Failed to prepare PHP repository"
-      return 1
-    }
-
-    # Setup Sury repository
-    manage_tool_repository "php" "$PHP_VERSION" "" "https://packages.sury.org/debsuryorg-archive-keyring.deb" || {
-      msg_error "Failed to setup PHP repository"
-      return 1
-    }
-
-    ensure_apt_working || return 1
-
-    # Force version preference during installation
-    mkdir -p /etc/apt/preferences.d
-    cat <<EOF >/etc/apt/preferences.d/php-pin
 Package: php${PHP_VERSION}*
 Pin: version ${PHP_VERSION}.*
 Pin-Priority: 1001
 
-Package: php8.*
+Package: php[0-9].*
 Pin: release o=packages.sury.org-php
 Pin-Priority: -1
 EOF
-    $STD apt-get update
+
-  fi
+  # Setup repository
+  prepare_repository_setup "php" "deb.sury.org-php" || {
+    msg_error "Failed to prepare PHP repository"
+    return 1
+  }
+
+  manage_tool_repository "php" "$PHP_VERSION" "" "https://packages.sury.org/debsuryorg-archive-keyring.deb" || {
+    msg_error "Failed to setup PHP repository"
+    return 1
+  }
+
+  ensure_apt_working || return 1
+  $STD apt-get update
 
   # Get available PHP version from repository
   local AVAILABLE_PHP_VERSION=""
@@ -3695,29 +3671,16 @@ EOF
     return 1
   fi
 
-  # Build module list with version constraints
+  # Build module list - without version pinning (preferences.d handles it)
-  local MODULE_LIST="php${PHP_VERSION}=${AVAILABLE_PHP_VERSION}-*"
+  local MODULE_LIST="php${PHP_VERSION}"
-  local FAILED_MODULES=()
 
   IFS=',' read -ra MODULES <<<"$COMBINED_MODULES"
   for mod in "${MODULES[@]}"; do
-    if apt-cache show "php${PHP_VERSION}-${mod}" 2>/dev/null | grep -q "^Package:"; then
+    MODULE_LIST+=" php${PHP_VERSION}-${mod}"
-      MODULE_LIST+=" php${PHP_VERSION}-${mod}=${AVAILABLE_PHP_VERSION}-*"
-    else
-      FAILED_MODULES+=("php${PHP_VERSION}-${mod}")
-    fi
   done
 
   if [[ "$PHP_FPM" == "YES" ]]; then
-    if apt-cache show "php${PHP_VERSION}-fpm" 2>/dev/null | grep -q "^Package:"; then
+    MODULE_LIST+=" php${PHP_VERSION}-fpm"
-      MODULE_LIST+=" php${PHP_VERSION}-fpm=${AVAILABLE_PHP_VERSION}-*"
-    else
-      FAILED_MODULES+=("php${PHP_VERSION}-fpm")
-    fi
-  fi
-
-  if [[ ${#FAILED_MODULES[@]} -gt 0 ]]; then
-    msg_warn "Some modules unavailable for PHP ${PHP_VERSION}: ${FAILED_MODULES[*]}"
   fi
 
   # install apache2 with PHP support if requested
@@ -3728,32 +3691,45 @@ EOF
         msg_error "Failed to install Apache"
         return 1
       }
-      install_packages_with_retry "libapache2-mod-php${PHP_VERSION}=${AVAILABLE_PHP_VERSION}-*" || {
+      install_packages_with_retry "libapache2-mod-php${PHP_VERSION}" || {
         msg_warn "Failed to install libapache2-mod-php${PHP_VERSION}, continuing without Apache module"
       }
     fi
   fi
 
-  # Install PHP packages with explicit version constraints
+  # Install PHP packages (pinning via preferences.d ensures correct version)
-  msg_info "Installing PHP ${PHP_VERSION} packages (version ${AVAILABLE_PHP_VERSION})"
+  msg_info "Installing PHP ${PHP_VERSION} packages"
   if ! install_packages_with_retry $MODULE_LIST; then
-    msg_warn "Failed to install PHP packages with version constraints, attempting without version pins"
+    msg_warn "Failed to install PHP packages, attempting individual installation"
+
+    # Install main package first (critical)
     install_packages_with_retry "php${PHP_VERSION}" || {
       msg_error "Failed to install php${PHP_VERSION}"
       return 1
     }
 
-    # Try to install modules individually without version constraint
+    # Try to install Apache module individually if requested
-    for pkg in "${MODULES[@]}"; do
+    if [[ "$PHP_APACHE" == "YES" ]]; then
-      install_packages_with_retry "php${PHP_VERSION}-${pkg}" || {
+      install_packages_with_retry "libapache2-mod-php${PHP_VERSION}" || {
-        msg_warn "Could not install php${PHP_VERSION}-${pkg}"
+        msg_warn "Could not install libapache2-mod-php${PHP_VERSION}"
       }
+    fi
+
+    # Try to install modules individually - skip those that don't exist
+    for pkg in "${MODULES[@]}"; do
+      if apt-cache search "^php${PHP_VERSION}-${pkg}\$" 2>/dev/null | grep -q "^php${PHP_VERSION}-${pkg}"; then
+        install_packages_with_retry "php${PHP_VERSION}-${pkg}" || {
+          msg_warn "Could not install php${PHP_VERSION}-${pkg}"
+        }
+      fi
     done
 
     if [[ "$PHP_FPM" == "YES" ]]; then
-      install_packages_with_retry "php${PHP_VERSION}-fpm" || {
+      if apt-cache search "^php${PHP_VERSION}-fpm\$" 2>/dev/null | grep -q "^php${PHP_VERSION}-fpm"; then
-        msg_warn "Could not install php${PHP_VERSION}-fpm"
+        install_packages_with_retry "php${PHP_VERSION}-fpm" || {
-      }
+          msg_warn "Could not install php${PHP_VERSION}-fpm"
+        }
+      fi
     fi
   fi
   cache_installed_version "php" "$PHP_VERSION"