Work around nextcloudpi's broken ssh.socket restart on Debian 13

Debian 13's openssh-server ships socket-activated by default. NCP's own bin/ncp/NETWORKING/SSH.sh detects that (systemctl is-active ssh.socket) but then runs "systemctl restart ssh" in that branch instead of reloading, which collides with the port ssh.socket already holds and fails with "Job for ssh.service failed" (#15944). Switch the container to classic ssh.service before handing off to their installer so it takes the safe "systemctl reload ssh" branch instead.
Revert installer pin, track master again
2026-07-22 13:52:53 +02:00 · 2026-07-21 23:23:25 +02:00 · 2026-07-21 23:16:02 +02:00 · 2026-07-21 23:14:52 +02:00 · 2026-07-21 23:08:01 +02:00 · 2026-07-21 22:57:50 +02:00
83 changed files with 263 additions and 721 deletions
@@ -505,6 +505,18 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit

 </details>

+## 2026-07-21
+
+### 🚀 Updated Scripts
+
+  - #### ✨ New Features
+
+    - Pangolin: Bump Version to 1.21.0 [@MickLesk](https://github.com/MickLesk) ([#15938](https://github.com/community-scripts/ProxmoxVE/pull/15938))
+
+  - #### 🔧 Refactor
+
+    - Standardize CT update backup handling [@MickLesk](https://github.com/MickLesk) ([#15937](https://github.com/community-scripts/ProxmoxVE/pull/15937))
+
 ## 2026-07-20

 ### 🚀 Updated Scripts
@@ -42,8 +42,6 @@ function update_script() {

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "affine_app" "toeverything/AFFiNE" "tarball" "${RELEASE}" "/opt/affine"

-    # Restore BEFORE the build: CLEAN_INSTALL wiped /opt/affine including .env,
-    # and the build below sources it
    restore_backup

    if [[ ! -f /opt/affine/.env ]]; then
@@ -30,16 +30,11 @@ function update_script() {
  fi

  if check_for_gh_release "cinny" "cinnyapp/cinny"; then
-    msg_info "Backing up Configuration"
-    cp /opt/cinny/config.json /opt/cinny_config.json.bak
-    msg_ok "Backed up Configuration"
+    create_backup /opt/cinny/config.json

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "cinny" "cinnyapp/cinny" "prebuild" "latest" "/opt/cinny" "cinny-*.tar.gz"

-    msg_info "Restoring Configuration"
-    cp /opt/cinny_config.json.bak /opt/cinny/config.json
-    rm -f /opt/cinny_config.json.bak
-    msg_ok "Restored Configuration"
+    restore_backup

    msg_info "Restarting nginx"
    $STD rc-service nginx restart
@@ -116,21 +116,10 @@ EOF

    msg_info "Creating Backup"
    BACKUP_FILE="/opt/dispatcharr_backup_$(date +%F_%H-%M-%S).tar.gz"
-    if [[ -f /opt/dispatcharr/.env ]]; then
-      cp /opt/dispatcharr/.env /tmp/dispatcharr.env.backup
-    fi
    if [[ -f /opt/dispatcharr/start-gunicorn.sh ]]; then
      rm -f /opt/dispatcharr/start-gunicorn.sh
    fi
-    if [[ -f /opt/dispatcharr/start-celery.sh ]]; then
-      cp /opt/dispatcharr/start-celery.sh /tmp/start-celery.sh.backup
-    fi
-    if [[ -f /opt/dispatcharr/start-celerybeat.sh ]]; then
-      cp /opt/dispatcharr/start-celerybeat.sh /tmp/start-celerybeat.sh.backup
-    fi
-    if [[ -f /opt/dispatcharr/start-daphne.sh ]]; then
-      cp /opt/dispatcharr/start-daphne.sh /tmp/start-daphne.sh.backup
-    fi
+    create_backup /opt/dispatcharr/.env /opt/dispatcharr/start-celery.sh /opt/dispatcharr/start-celerybeat.sh /opt/dispatcharr/start-daphne.sh
    if [[ -f /opt/dispatcharr/.env ]]; then
      set -o allexport
      source /opt/dispatcharr/.env
@@ -145,20 +134,9 @@ EOF

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "dispatcharr" "Dispatcharr/Dispatcharr" "tarball"

-    msg_info "Updating Dispatcharr Backend"
-    if [[ -f /tmp/dispatcharr.env.backup ]]; then
-      mv /tmp/dispatcharr.env.backup /opt/dispatcharr/.env
-    fi
-    if [[ -f /tmp/start-celery.sh.backup ]]; then
-      mv /tmp/start-celery.sh.backup /opt/dispatcharr/start-celery.sh
-    fi
-    if [[ -f /tmp/start-celerybeat.sh.backup ]]; then
-      mv /tmp/start-celerybeat.sh.backup /opt/dispatcharr/start-celerybeat.sh
-    fi
-    if [[ -f /tmp/start-daphne.sh.backup ]]; then
-      mv /tmp/start-daphne.sh.backup /opt/dispatcharr/start-daphne.sh
-    fi
+    restore_backup

+    msg_info "Updating Dispatcharr Backend"
    if ! grep -q "DJANGO_SECRET_KEY" /opt/dispatcharr/.env; then
      DJANGO_SECRET=$(openssl rand -base64 48 | tr -dc 'a-zA-Z0-9' | cut -c1-50)
      echo "DJANGO_SECRET_KEY=$DJANGO_SECRET" >>/opt/dispatcharr/.env
@@ -35,21 +35,11 @@ function update_script() {
    systemctl stop nginx
    msg_ok "Stopped Service"

-    if [[ -f /opt/fladder/assets/config/config.json ]]; then
-      msg_info "Backing up configuration"
-      cp /opt/fladder/assets/config/config.json /tmp/fladder_config.json.bak
-      msg_ok "Configuration backed up"
-    fi
+    create_backup /opt/fladder/assets/config/config.json

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Fladder" "DonutWare/Fladder" "prebuild" "latest" "/opt/fladder" "Fladder-Web-*.zip"

-    if [[ -f /tmp/fladder_config.json.bak ]]; then
-      msg_info "Restoring configuration"
-      mkdir -p /opt/fladder/assets/config
-      cp /tmp/fladder_config.json.bak /opt/fladder/assets/config/config.json
-      rm -f /tmp/fladder_config.json.bak
-      msg_ok "Configuration restored"
-    fi
+    restore_backup

    msg_info "Starting Service"
    systemctl start nginx
@@ -34,12 +34,11 @@ function update_script() {
    systemctl stop flatnotes
    msg_ok "Stopped Service"

-    msg_info "Backing up Configuration and Data"
-    cp /opt/flatnotes/.env /opt/flatnotes.env
-    cp -r /opt/flatnotes/data /opt/flatnotes_data_backup
-    msg_ok "Backed up Configuration and Data"
+    create_backup /opt/flatnotes/.env /opt/flatnotes/data

-    fetch_and_deploy_gh_release "flatnotes" "dullage/flatnotes" "tarball"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "flatnotes" "dullage/flatnotes" "tarball"
+
+    restore_backup

    msg_info "Updating Flatnotes"
    cd /opt/flatnotes/client
@@ -52,13 +51,6 @@ function update_script() {
    $STD /usr/local/bin/uv sync
    msg_ok "Updated Flatnotes"

-    msg_info "Restoring Configuration and Data"
-    cp /opt/flatnotes.env /opt/flatnotes/.env
-    cp -r /opt/flatnotes_data_backup/. /opt/flatnotes/data
-    rm -f /opt/flatnotes.env
-    rm -r /opt/flatnotes_data_backup
-    msg_ok "Restored Configuration and Data"
-
    msg_info "Starting Service"
    systemctl start flatnotes
    msg_ok "Started Service"
@@ -38,9 +38,9 @@ function update_script() {
    systemctl stop fluid-calendar
    msg_info "Stopped Service"

-    cp /opt/fluid-calendar/.env /opt/fluid.env
+    create_backup /opt/fluid-calendar/.env
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "fluid-calendar" "dotnetfactory/fluid-calendar" "tarball"
-    mv /opt/fluid.env /opt/fluid-calendar/.env
+    restore_backup

    msg_info "Updating Fluid Calendar"
    cd /opt/fluid-calendar
@@ -41,13 +41,15 @@ function update_script() {
      --exclude="ghostfolio/node_modules" \
      --exclude="ghostfolio/dist" \
      ghostfolio
-    mv /opt/ghostfolio/.env /opt/env.backup
    msg_ok "Backup Created"

+    create_backup /opt/ghostfolio/.env
+
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "ghostfolio" "ghostfolio/ghostfolio" "tarball" "latest" "/opt/ghostfolio"

+    restore_backup
+
    msg_info "Updating Ghostfolio"
-    mv /opt/env.backup /opt/ghostfolio/.env
    sed -i -E '/^DATABASE_URL=/ s/[?&]sslmode=prefer//g' /opt/ghostfolio/.env
    cd /opt/ghostfolio
    $STD npm ci
@@ -35,18 +35,11 @@ function update_script() {
    systemctl stop gogs
    msg_ok "Stopped Service"

-    msg_info "Backing up Data"
-    cp -r /opt/gogs/custom /opt/gogs_custom_backup
-    cp -r /opt/gogs/data /opt/gogs_data_backup
-    msg_ok "Backed up Data"
+    create_backup /opt/gogs/custom /opt/gogs/data

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "gogs" "gogs/gogs" "prebuild" "latest" "/opt/gogs" "gogs_*_linux_$(arch_resolve).tar.gz"

-    msg_info "Restoring Data"
-    cp -r /opt/gogs_custom_backup/. /opt/gogs/custom
-    cp -r /opt/gogs_data_backup/. /opt/gogs/data
-    rm -rf /opt/gogs_custom_backup /opt/gogs_data_backup
-    msg_ok "Restored Data"
+    restore_backup

    msg_info "Starting Service"
    systemctl start gogs
@@ -37,21 +37,14 @@ function update_script() {
    systemctl stop grist
    msg_ok "Stopped Service"

-    msg_info "Creating backup"
-    rm -rf /opt/grist_bak
-    mv /opt/grist /opt/grist_bak
-    msg_ok "Backup created"
+    create_backup /opt/grist/.env /opt/grist/docs /opt/grist/grist-sessions.db /opt/grist/landing.db

-    fetch_and_deploy_gh_release "grist" "gristlabs/grist-core" "tarball"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "grist" "gristlabs/grist-core" "tarball"
+
+    restore_backup

    msg_info "Updating Grist"
    mkdir -p /opt/grist/docs
-    cp -n /opt/grist_bak/.env /opt/grist/.env
-    if ls /opt/grist_bak/docs/* &>/dev/null; then
-      cp -r /opt/grist_bak/docs/* /opt/grist/docs/
-    fi
-    [[ -f /opt/grist_bak/grist-sessions.db ]] && cp /opt/grist_bak/grist-sessions.db /opt/grist/grist-sessions.db
-    [[ -f /opt/grist_bak/landing.db ]] && cp /opt/grist_bak/landing.db /opt/grist/landing.db
    cd /opt/grist
    $STD yarn install
    $STD yarn run build:prod
@@ -39,8 +39,12 @@ function update_script() {
    systemctl stop homebox
    msg_ok "Stopped Service"

+    create_backup /opt/homebox/.env /opt/homebox/.data
+
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "homebox" "sysadminsmedia/homebox" "prebuild" "latest" "/opt/homebox" "homebox_Linux_$(arch_resolve "x86_64" "arm64").tar.gz"
    chmod +x /opt/homebox/homebox
+
+    restore_backup
    [ -f /opt/.env ] && mv /opt/.env /opt/homebox/.env
    [ -d /opt/.data ] && mv /opt/.data /opt/homebox/.data

@@ -35,16 +35,12 @@ function update_script() {
    systemctl stop homelable
    msg_ok "Stopped Service"

-    msg_info "Backing up Configuration and Data"
-    cp /opt/homelable/backend/.env /opt/homelable.env.bak
-    cp -r /opt/homelable/data /opt/homelable_data_bak
-    if [[ -f /opt/homelable/mcp/.env ]]; then
-      cp -a /opt/homelable/mcp/.env /opt/homelable-mcp.env.bak
-    fi
-    msg_ok "Backed up Configuration and Data"
+    create_backup /opt/homelable/backend/.env /opt/homelable/data /opt/homelable/mcp/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "homelable" "Pouzor/homelable" "tarball" "latest" "/opt/homelable"

+    restore_backup
+
    msg_info "Updating Python Dependencies"
    cd /opt/homelable/backend
    $STD uv venv --clear /opt/homelable/backend/.venv
@@ -57,17 +53,8 @@ function update_script() {
    $STD npm run build
    msg_ok "Rebuilt Frontend"

-    msg_info "Restoring Configuration and Data"
-    cp /opt/homelable.env.bak /opt/homelable/backend/.env
-    cp -r /opt/homelable_data_bak/. /opt/homelable/data/
-    rm -f /opt/homelable.env.bak
-    rm -rf /opt/homelable_data_bak
-    msg_ok "Restored Configuration and Data"
-
-    if [[ -f /opt/homelable-mcp.env.bak ]]; then
+    if [[ -f /opt/homelable/mcp/.env ]]; then
      msg_info "Restoring MCP Server"
-      cp -a /opt/homelable-mcp.env.bak /opt/homelable/mcp/.env
-      rm -f /opt/homelable-mcp.env.bak
      MCP_OWNER=$(stat -c '%U' /opt/homelable/mcp/.env)
      cd /opt/homelable/mcp
      $STD uv venv --clear /opt/homelable/mcp/.venv
@@ -37,20 +37,12 @@ function update_script() {
    systemctl stop homepage
    msg_ok "Stopped service"

-    msg_info "Creating Backup"
-    cp /opt/homepage/.env /opt/homepage.env
-    cp -r /opt/homepage/config /opt/homepage_config_backup
-    [[ -d /opt/homepage/public/images ]] && cp -r /opt/homepage/public/images /opt/homepage_images_backup
-    [[ -d /opt/homepage/public/icons ]] && cp -r /opt/homepage/public/icons /opt/homepage_icons_backup
-    msg_ok "Created Backup"
+    create_backup /opt/homepage/.env /opt/homepage/config
+    BACKUP_DIR=/opt/homepage-assets.backup create_backup /opt/homepage/public/images /opt/homepage/public/icons
    
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "homepage" "gethomepage/homepage" "tarball"
    
-    msg_info "Restoring Backup"
-    mv /opt/homepage.env /opt/homepage
-    rm -rf /opt/homepage/config
-    mv /opt/homepage_config_backup /opt/homepage/config
-    msg_ok "Restored Backup"
+    restore_backup

    msg_info "Updating Homepage (Patience)"
    RELEASE=$(get_latest_github_release "gethomepage/homepage")
@@ -63,8 +55,7 @@ function update_script() {
    export NEXT_PUBLIC_BUILDTIME=$(curl -fsSL https://api.github.com/repos/gethomepage/homepage/releases/latest | jq -r '.published_at')
    export NEXT_TELEMETRY_DISABLED=1
    $STD pnpm build
-    [[ -d /opt/homepage_images_backup ]] && mv /opt/homepage_images_backup /opt/homepage/public/images
-    [[ -d /opt/homepage_icons_backup ]] && mv /opt/homepage_icons_backup /opt/homepage/public/icons
+    BACKUP_DIR=/opt/homepage-assets.backup restore_backup
    msg_ok "Updated Homepage"

    msg_info "Starting service"
@@ -36,16 +36,11 @@ function update_script() {
    systemctl stop hoodik
    msg_ok "Stopped Service"

-    msg_info "Backing up Configuration"
-    cp /opt/hoodik/.env /opt/hoodik.env.bak
-    msg_ok "Backed up Configuration"
+    create_backup /opt/hoodik/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "hoodik" "hudikhq/hoodik" "prebuild" "latest" "/opt/hoodik" "*$(arch_resolve "x86_64" "arm64").tar.gz"

-    msg_info "Restoring Configuration"
-    cp /opt/hoodik.env.bak /opt/hoodik/.env
-    rm -f /opt/hoodik.env.bak
-    msg_ok "Restored Configuration"
+    restore_backup

    msg_info "Starting Service"
    systemctl start hoodik
@@ -35,16 +35,11 @@ function update_script() {
    systemctl stop igotify
    msg_ok "Stopped Service"

-    msg_info "Backing up Configuration"
-    cp /opt/igotify/.env /opt/igotify.env.bak
-    msg_ok "Backed up Configuration"
+    create_backup /opt/igotify/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "igotify" "androidseb25/iGotify-Notification-Assistent" "prebuild" "latest" "/opt/igotify" "iGotify-Notification-Service-$(arch_resolve)-v*.zip"

-    msg_info "Restoring Configuration"
-    cp /opt/igotify.env.bak /opt/igotify/.env
-    rm -f /opt/igotify.env.bak
-    msg_ok "Restored Configuration"
+    restore_backup

    msg_info "Starting Service"
    systemctl start igotify
@@ -35,9 +35,7 @@ function update_script() {
    systemctl stop immichframe
    msg_ok "Stopped Service"

-    msg_info "Backing up Configuration"
-    cp -r /opt/immichframe/Config /tmp/immichframe_config.bak
-    msg_ok "Backed up Configuration"
+    create_backup /opt/immichframe/Config

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "immichframe" "immichFrame/ImmichFrame" "tarball" "latest" "/tmp/immichframe"

@@ -57,11 +55,8 @@ function update_script() {
    rm -rf /tmp/immichframe
    msg_ok "Setup ImmichFrame"

-    msg_info "Restoring Configuration"
-    cp -r /tmp/immichframe_config.bak/* /opt/immichframe/Config/
-    rm -rf /tmp/immichframe_config.bak
+    restore_backup
    chown -R immichframe:immichframe /opt/immichframe
-    msg_ok "Restored Configuration"


    msg_info "Starting Service"
@@ -41,20 +41,14 @@ function update_script() {
    NODE_VERSION="22" setup_nodejs
    PG_VERSION="17" setup_postgresql

-    msg_info "Creating Backup"
-    rm -f /opt/.env.backup
-    rm -rf /opt/investbrain_backup
-    cp /opt/investbrain/.env /opt/.env.backup
-    cp -r /opt/investbrain/storage /opt/investbrain_backup
-    msg_ok "Created Backup"
+    create_backup /opt/investbrain/.env /opt/investbrain/storage

-    fetch_and_deploy_gh_release "Investbrain" "investbrainapp/investbrain" "tarball" "latest" "/opt/investbrain"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Investbrain" "investbrainapp/investbrain" "tarball" "latest" "/opt/investbrain"
+
+    restore_backup

    msg_info "Updating Investbrain"
    cd /opt/investbrain
-    rm -rf /opt/investbrain/storage
-    cp /opt/.env.backup /opt/investbrain/.env
-    cp -r /opt/investbrain_backup/ /opt/investbrain/storage
    export COMPOSER_ALLOW_SUPERUSER=1
    $STD /usr/local/bin/composer install --no-interaction --no-dev --optimize-autoloader
    $STD npm install
@@ -69,7 +63,6 @@ function update_script() {
    $STD php artisan event:cache
    chown -R www-data:www-data /opt/investbrain
    chmod -R 775 /opt/investbrain/storage /opt/investbrain/bootstrap/cache
-    rm -rf /opt/.env.backup /opt/investbrain_backup
    msg_ok "Updated Investbrain"

    msg_info "Starting Services"
@@ -35,21 +35,11 @@ function update_script() {
    systemctl stop supervisor nginx php8.4-fpm
    msg_ok "Stopped Services"

-    msg_info "Creating Backup"
-    mkdir -p /tmp/invoiceninja_backup
-    cp /opt/invoiceninja/.env /tmp/invoiceninja_backup/
-    cp -r /opt/invoiceninja/storage /tmp/invoiceninja_backup/ 2>/dev/null || true
-    cp -r /opt/invoiceninja/public/storage /tmp/invoiceninja_backup/public_storage 2>/dev/null || true
-    msg_ok "Created Backup"
+    create_backup /opt/invoiceninja/.env /opt/invoiceninja/storage /opt/invoiceninja/public/storage

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "invoiceninja" "invoiceninja/invoiceninja" "prebuild" "latest" "/opt/invoiceninja" "invoiceninja.tar.gz"

-    msg_info "Restoring Data"
-    cp /tmp/invoiceninja_backup/.env /opt/invoiceninja/
-    cp -r /tmp/invoiceninja_backup/storage/* /opt/invoiceninja/storage/ 2>/dev/null || true
-    cp -r /tmp/invoiceninja_backup/public_storage/* /opt/invoiceninja/public/storage/ 2>/dev/null || true
-    rm -rf /tmp/invoiceninja_backup
-    msg_ok "Restored Data"
+    restore_backup

    msg_info "Running Migrations"
    cd /opt/invoiceninja 
@@ -35,19 +35,11 @@ function update_script() {
    systemctl stop caddy
    msg_ok "Stopped Services"

-    msg_info "Backing up Data"
-    cp /opt/invoiceshelf/.env /opt/invoiceshelf.env.bak
-    cp -r /opt/invoiceshelf/storage /opt/invoiceshelf_storage_backup
-    msg_ok "Backed up Data"
+    create_backup /opt/invoiceshelf/.env /opt/invoiceshelf/storage

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "invoiceshelf" "InvoiceShelf/InvoiceShelf" "tarball"

-    msg_info "Restoring Data"
-    cp /opt/invoiceshelf.env.bak /opt/invoiceshelf/.env
-    rm -f /opt/invoiceshelf.env.bak
-    cp -r /opt/invoiceshelf_storage_backup/. /opt/invoiceshelf/storage
-    rm -rf /opt/invoiceshelf_storage_backup
-    msg_ok "Restored Data"
+    restore_backup

    msg_info "Updating Application"
    cd /opt/invoiceshelf
@@ -36,9 +36,9 @@ function update_script() {
    systemctl stop joplin-server
    msg_ok "Stopped Services"

-    cp /opt/joplin-server/.env /opt
+    create_backup /opt/joplin-server/.env
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "joplin-server" "laurent22/joplin" "tarball"
-    mv /opt/.env /opt/joplin-server
+    restore_backup

    msg_info "Updating Joplin-Server"
    cd /opt/joplin-server
@@ -35,20 +35,12 @@ function update_script() {
    systemctl stop jotty
    msg_ok "Stopped Service"

-    msg_info "Backing up configuration & data"
-    cp /opt/jotty/.env /opt/app.env
-    [[ -d /opt/jotty/data ]] && mv /opt/jotty/data /opt/data
-    [[ -d /opt/jotty/config ]] && mv /opt/jotty/config /opt/config
-    msg_ok "Backed up configuration & data"
+    create_backup /opt/jotty/.env /opt/jotty/data /opt/jotty/config

    NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "jotty" "fccview/jotty" "prebuild" "latest" "/opt/jotty" "jotty_*_prebuild.tar.gz"

-    msg_info "Restoring configuration & data"
-    mv /opt/app.env /opt/jotty/.env
-    [[ -d /opt/data ]] && mv /opt/data /opt/jotty/data
-    [[ -d /opt/config ]] && cp -a /opt/config/* /opt/jotty/config && rm -rf /opt/config
-    msg_ok "Restored configuration & data"
+    restore_backup

    msg_info "Starting Service"
    systemctl start jotty
@@ -35,16 +35,11 @@ function update_script() {
    systemctl stop kan
    msg_ok "Stopped Service"

-    msg_info "Backing up Data"
-    cp /opt/kan/.env /opt/kan.env.bak
-    msg_ok "Backed up Data"
+    create_backup /opt/kan/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_tag "kan" "kanbn/kan" "latest"

-    msg_info "Restoring Configuration"
-    cp /opt/kan.env.bak /opt/kan/.env
-    rm -f /opt/kan.env.bak
-    msg_ok "Restored Configuration"
+    restore_backup

    msg_info "Building Application"
    cd /opt/kan
@@ -37,18 +37,11 @@ function update_script() {
    systemctl stop kima-frontend kima-backend kima-analyzer kima-analyzer-clap
    msg_ok "Stopped Services"

-    msg_info "Backing up Data"
-    cp /opt/kima-hub/backend/.env /opt/kima-hub-backend-env.bak
-    cp /opt/kima-hub/frontend/.env /opt/kima-hub-frontend-env.bak
-    msg_ok "Backed up Data"
+    create_backup /opt/kima-hub/backend/.env /opt/kima-hub/frontend/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "kima-hub" "Chevron7Locked/kima-hub" "tarball"

-    msg_info "Restoring Data"
-    cp /opt/kima-hub-backend-env.bak /opt/kima-hub/backend/.env
-    cp /opt/kima-hub-frontend-env.bak /opt/kima-hub/frontend/.env
-    rm -f /opt/kima-hub-backend-env.bak /opt/kima-hub-frontend-env.bak
-    msg_ok "Restored Data"
+    restore_backup

    msg_info "Rebuilding Backend"
    cd /opt/kima-hub/backend
@@ -35,22 +35,14 @@ function update_script() {
    systemctl stop kitchenowl
    msg_ok "Stopped Service"

-    msg_info "Creating Backup"
-    mkdir -p /opt/kitchenowl_backup
-    cp -r /opt/kitchenowl/data /opt/kitchenowl_backup/
-    cp -f /opt/kitchenowl/kitchenowl.env /opt/kitchenowl_backup/
-    msg_ok "Created Backup"
+    create_backup /opt/kitchenowl/data /opt/kitchenowl/kitchenowl.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "kitchenowl" "TomBursch/kitchenowl" "tarball" "latest" "/opt/kitchenowl"
    rm -rf /opt/kitchenowl/web
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "kitchenowl-web" "TomBursch/kitchenowl" "prebuild" "latest" "/opt/kitchenowl/web" "kitchenowl_Web.tar.gz"

-    msg_info "Restoring data"
+    restore_backup
    sed -i 's/default=True/default=False/' /opt/kitchenowl/backend/wsgi.py
-    cp -r /opt/kitchenowl_backup/data /opt/kitchenowl/
-    cp -f /opt/kitchenowl_backup/kitchenowl.env /opt/kitchenowl/
-    rm -rf /opt/kitchenowl_backup
-    msg_ok "Restored data"

    msg_info "Updating KitchenOwl"
    cd /opt/kitchenowl/backend
@@ -35,21 +35,11 @@ function update_script() {
    systemctl stop nginx php8.4-fpm
    msg_ok "Stopped Services"

-    msg_info "Creating Backup"
-    mkdir -p /tmp/koel_backup
-    cp /opt/koel/.env /tmp/koel_backup/
-    cp -r /opt/koel/storage /tmp/koel_backup/ 2>/dev/null || true
-    cp -r /opt/koel/public/img /tmp/koel_backup/ 2>/dev/null || true
-    msg_ok "Created Backup"
+    create_backup /opt/koel/.env /opt/koel/storage /opt/koel/public/img

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "koel" "koel/koel" "prebuild" "latest" "/opt/koel" "koel-*.tar.gz"

-    msg_info "Restoring Data"
-    cp /tmp/koel_backup/.env /opt/koel/
-    cp -r /tmp/koel_backup/storage/* /opt/koel/storage/ 2>/dev/null || true
-    cp -r /tmp/koel_backup/img/* /opt/koel/public/img/ 2>/dev/null || true
-    rm -rf /tmp/koel_backup
-    msg_ok "Restored Data"
+    restore_backup

    msg_info "Running Migrations"
    cd /opt/koel 
@@ -34,20 +34,18 @@ function update_script() {
    msg_info "Creating Backup"
    mariadb-dump leantime >"/opt/leantime_db_backup_$(date +%F).sql"
    tar -czf "/opt/leantime_backup_$(date +%F).tar.gz" "/opt/leantime"
-    mv /opt/leantime /opt/leantime_bak
    msg_ok "Backup Created"

-    fetch_and_deploy_gh_release "leantime" "Leantime/leantime" "prebuild" "latest" "/opt/leantime" Leantime*.tar.gz
+    create_backup /opt/leantime/config/.env

-    msg_info "Restoring Config & Permissions"
-    mv /opt/leantime_bak/config/.env /opt/leantime/config/.env
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "leantime" "Leantime/leantime" "prebuild" "latest" "/opt/leantime" Leantime*.tar.gz
+
+    restore_backup
+
+    msg_info "Setting Permissions"
    chown -R www-data:www-data "/opt/leantime"
    chmod -R 750 "/opt/leantime"
-    msg_ok "Restored Config & Permissions"
-
-    msg_info "Removing Backup"
-    rm -rf /opt/leantime_bak
-    msg_ok "Removed Backup"
+    msg_ok "Set Permissions"
    msg_ok "Updated successfully!"
  fi
  exit
@@ -35,12 +35,12 @@ function update_script() {
    systemctl stop librechat rag-api
    msg_ok "Stopped Services"

-    msg_info "Backing up Configuration"
-    cp /opt/librechat/.env /opt/librechat.env.bak
-    msg_ok "Backed up Configuration"
+    create_backup /opt/librechat/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_tag "librechat" "danny-avila/LibreChat"

+    restore_backup
+
    msg_info "Installing Dependencies"
    cd /opt/librechat
    $STD npm ci
@@ -52,11 +52,6 @@ function update_script() {
    $STD npm cache clean --force
    msg_ok "Built Frontend"

-    msg_info "Restoring Configuration"
-    cp /opt/librechat.env.bak /opt/librechat/.env
-    rm -f /opt/librechat.env.bak
-    msg_ok "Restored Configuration"
-
    msg_info "Starting Services"
    systemctl start rag-api librechat
    msg_ok "Started Services"
@@ -68,22 +63,17 @@ function update_script() {
    systemctl stop rag-api
    msg_ok "Stopped RAG API"

-    msg_info "Backing up RAG API Configuration"
-    cp /opt/rag-api/.env /opt/rag-api.env.bak
-    msg_ok "Backed up RAG API Configuration"
+    create_backup /opt/rag-api/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "rag-api" "danny-avila/rag_api" "tarball"

+    restore_backup
+
    msg_info "Updating RAG API Dependencies"
    cd /opt/rag-api
    $STD .venv/bin/pip install -r requirements.lite.txt
    msg_ok "Updated RAG API Dependencies"

-    msg_info "Restoring RAG API Configuration"
-    cp /opt/rag-api.env.bak /opt/rag-api/.env
-    rm -f /opt/rag-api.env.bak
-    msg_ok "Restored RAG API Configuration"
-
    msg_info "Starting RAG API"
    systemctl start rag-api
    msg_ok "Started RAG API"
@@ -35,19 +35,12 @@ function update_script() {
    systemctl stop nginx linkding linkding-tasks
    msg_ok "Stopped Services"

-    msg_info "Backing up Data"
-    cp -r /opt/linkding/data /opt/linkding_data_backup
-    cp /opt/linkding/.env /opt/linkding_env_backup
-    msg_ok "Backed up Data"
+    create_backup /opt/linkding/data /opt/linkding/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "linkding" "sissbruecker/linkding" "tarball"

-    msg_info "Restoring Data"
-    cp -r /opt/linkding_data_backup/. /opt/linkding/data
-    cp /opt/linkding_env_backup /opt/linkding/.env
-    rm -rf /opt/linkding_data_backup /opt/linkding_env_backup
+    restore_backup
    ln -sf /usr/lib/$(arch_resolve "x86_64-linux-gnu" "aarch64-linux-gnu")/mod_icu.so /opt/linkding/libicu.so
-    msg_ok "Restored Data"

    msg_info "Updating LinkDing"
    cd /opt/linkding
@@ -35,13 +35,11 @@ function update_script() {

    RUST_CRATES="monolith" setup_rust

-    msg_info "Backing up data"
-    mv /opt/linkwarden/.env /opt/.env
-    [ -d /opt/linkwarden/data ] && mv /opt/linkwarden/data /opt/data.bak
-    rm -rf /opt/linkwarden
-    msg_ok "Backed up data"
+    create_backup /opt/linkwarden/.env /opt/linkwarden/data

-    fetch_and_deploy_gh_release "linkwarden" "linkwarden/linkwarden" "tarball"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "linkwarden" "linkwarden/linkwarden" "tarball"
+
+    restore_backup

    msg_info "Updating Linkwarden"
    cd /opt/linkwarden
@@ -60,11 +58,9 @@ function update_script() {
    $STD yarn
    $STD npx playwright install-deps
    $STD npx playwright install
-    mv /opt/.env /opt/linkwarden/.env
    $STD yarn prisma:generate
    $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
    rm -rf /root/.cache/yarn
    rm -rf /opt/linkwarden/.next/cache
@@ -35,16 +35,11 @@ function update_script() {
    systemctl stop lobehub
    msg_ok "Stopped Services"

-    msg_info "Backing up Data"
-    cp /opt/lobehub/.env /opt/lobehub.env.bak
-    msg_ok "Backed up Data"
+    create_backup /opt/lobehub/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "lobehub" "lobehub/lobehub" "tarball"

-    msg_info "Restoring Configuration"
-    cp /opt/lobehub.env.bak /opt/lobehub/.env
-    rm -f /opt/lobehub.env.bak
-    msg_ok "Restored Configuration"
+    restore_backup

    msg_info "Building Application"
    cd /opt/lobehub
@@ -36,10 +36,7 @@ function update_script() {
    systemctl stop mail-archiver
    msg_ok "Stopped Mail-Archiver"

-    msg_info "Creating Backup"
-    cp /opt/mail-archiver/appsettings.json /opt/mail-archiver/.env /opt/
-    [[ -d /opt/mail-archiver/DataProtection-Keys ]] && cp -r /opt/mail-archiver/DataProtection-Keys /opt
-    msg_ok "Created Backup"
+    create_backup /opt/mail-archiver/appsettings.json /opt/mail-archiver/.env /opt/mail-archiver/DataProtection-Keys

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "mail-archiver" "s1t5/mail-archiver" "tarball"

@@ -51,10 +48,7 @@ function update_script() {
    rm -rf /opt/mail-archiver-build
    msg_ok "Updated Mail-Archiver"

-    msg_info "Restoring Backup"
-    cp /opt/appsettings.json /opt/.env /opt/mail-archiver
-    [[ -d /opt/DataProtection-Keys ]] && cp -r /opt/DataProtection-Keys /opt/mail-archiver/
-    msg_ok "Restored Backup"
+    restore_backup

    msg_info "Starting Mail-Archiver"
    systemctl start mail-archiver
@@ -39,13 +39,15 @@ function update_script() {

    msg_info "Backing up Data"
    CURRENT_VERSION=$(grep -oP 'APP_VERSION=\K[^ ]+' /opt/manyfold/.env || echo "unknown")
-    cp -r /opt/manyfold/app/storage /opt/manyfold_storage_backup 2>/dev/null || true
-    cp -r /opt/manyfold/app/tmp /opt/manyfold_tmp_backup 2>/dev/null || true
    $STD tar -czf "/opt/manyfold_${CURRENT_VERSION}_backup.tar.gz" -C /opt/manyfold app
    msg_ok "Backed up Data"

+    create_backup /opt/manyfold/app/storage /opt/manyfold/app/tmp
+
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "manyfold" "manyfold3d/manyfold" "tarball" "latest" "/opt/manyfold/app"

+    restore_backup
+
    msg_info "Configuring Manyfold"
    RUBY_INSTALL_VERSION=$(cat /opt/manyfold/app/.ruby-version)
    YARN_VERSION=$(grep '"packageManager":' /opt/manyfold/app/package.json | sed -E 's/.*"(yarn@[0-9\.]+)".*/\1/')
@@ -55,14 +57,9 @@ function update_script() {

    RUBY_VERSION=${RUBY_INSTALL_VERSION} RUBY_INSTALL_RAILS="true" HOME=/home/manyfold setup_ruby

-    msg_info "Restoring Data"
-    rm -rf /opt/manyfold/app/{storage,tmp}
-    cp -r /opt/manyfold_storage_backup /opt/manyfold/app/storage 2>/dev/null || true
-    cp -r /opt/manyfold_tmp_backup /opt/manyfold/app/tmp 2>/dev/null || true
+    msg_info "Setting Permissions"
    chown -R manyfold:manyfold {/home/manyfold,/opt/manyfold}
-    chown -R manyfold:manyfold /opt/manyfold/app/storage /opt/manyfold/app/tmp /opt/manyfold/app/config
-    rm -rf /opt/manyfold_storage_backup /opt/manyfold_tmp_backup
-    msg_ok "Restored Data"
+    msg_ok "Set Permissions"

    msg_info "Installing Manyfold"

@@ -35,11 +35,7 @@ function update_script() {
    systemctl stop caddy
    msg_ok "Stopped Services"

-    msg_info "Backing up Data"
-    [[ -f /opt/matomo/config/config.ini.php ]] && cp /opt/matomo/config/config.ini.php /opt/matomo_config.bak
-    [[ -d /opt/matomo/misc/user ]] && cp -r /opt/matomo/misc/user /opt/matomo_user_backup
-    [[ -f /root/matomo.creds ]] && cp /root/matomo.creds /opt/matomo_db_creds.bak
-    msg_ok "Backed up Data"
+    create_backup /opt/matomo/config/config.ini.php /opt/matomo/misc/user /root/matomo.creds

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "matomo" "matomo-org/matomo" "prebuild" "latest" "/opt/matomo" "matomo-*.zip"

@@ -53,20 +49,8 @@ function update_script() {
    chmod -R 755 /opt/matomo/tmp
    msg_ok "Set up Matomo"

-    msg_info "Restoring Data"
-    if [[ -f /opt/matomo_config.bak ]]; then
-      mkdir -p /opt/matomo/config
-      cp /opt/matomo_config.bak /opt/matomo/config/config.ini.php
-    fi
-    if [[ -d /opt/matomo_user_backup ]]; then
-      mkdir -p /opt/matomo/misc/user
-      cp -r /opt/matomo_user_backup/. /opt/matomo/misc/user
-    fi
-    [[ -f /opt/matomo_db_creds.bak ]] && cp /opt/matomo_db_creds.bak /root/matomo.creds
-    rm -f /opt/matomo_config.bak /opt/matomo_db_creds.bak
-    rm -rf /opt/matomo_user_backup
+    restore_backup
    chown -R www-data:www-data /opt/matomo
-    msg_ok "Restored Data"

    if [[ -f /opt/matomo/console ]]; then
      msg_info "Running Matomo database upgrade"
@@ -33,14 +33,13 @@ function update_script() {
      systemctl stop meilisearch-ui
      msg_ok "Stopped Meilisearch-UI"

-      cp /opt/meilisearch-ui/.env.local /tmp/.env.local.bak
-      rm -rf /opt/meilisearch-ui
-      fetch_and_deploy_gh_release "meilisearch-ui" "riccox/meilisearch-ui" "tarball"
+      create_backup /opt/meilisearch-ui/.env.local
+      CLEAN_INSTALL=1 fetch_and_deploy_gh_release "meilisearch-ui" "riccox/meilisearch-ui" "tarball"
+      restore_backup

      msg_info "Configuring Meilisearch-UI"
      cd /opt/meilisearch-ui
      sed -i 's|const hash = execSync("git rev-parse HEAD").toString().trim();|const hash = "unknown";|' /opt/meilisearch-ui/vite.config.ts
-      mv /tmp/.env.local.bak /opt/meilisearch-ui/.env.local
      $STD pnpm install
      msg_ok "Configured Meilisearch-UI"

@@ -48,14 +48,11 @@ function update_script() {
    systemctl stop metube
    msg_ok "Stopped Service"

-    msg_info "Backing up Old Installation"
-    if [[ -d /opt/metube_bak ]]; then
-      rm -rf /opt/metube_bak
-    fi
-    mv /opt/metube /opt/metube_bak
-    msg_ok "Backup created"
+    create_backup /opt/metube/.env

-    fetch_and_deploy_gh_release "metube" "alexta69/metube" "tarball" "latest"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "metube" "alexta69/metube" "tarball" "latest"
+
+    restore_backup

    msg_info "Building Frontend"
    cd /opt/metube/ui
@@ -75,13 +72,6 @@ function update_script() {
    $STD uv sync
    msg_ok "Installed Backend"

-    msg_info "Restoring .env"
-    if [[ -f /opt/metube_bak/.env ]]; then
-      cp /opt/metube_bak/.env /opt/metube/.env
-    fi
-    rm -rf /opt/metube_bak
-    msg_ok "Restored .env"
-
    if grep -q 'pipenv' /etc/systemd/system/metube.service; then
      msg_info "Patching systemd Service"
      cat <<EOF >/etc/systemd/system/metube.service
@@ -35,15 +35,11 @@ function update_script() {
    systemctl stop nametag
    msg_ok "Stopped Service"

-    msg_info "Backing up Data"
-    cp /opt/nametag/.env /opt/nametag.env.bak
-    cp -r /opt/nametag/data /opt/nametag_data_bak
-    msg_ok "Backed up Data"
+    create_backup /opt/nametag/.env /opt/nametag/data

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "nametag" "mattogodoy/nametag" "tarball" "latest" "/opt/nametag"

-    # Restore .env BEFORE the build: CLEAN_INSTALL wiped it and the build sources it
-    cp /opt/nametag.env.bak /opt/nametag/.env
+    restore_backup

    msg_info "Rebuilding Application"
    cd /opt/nametag
@@ -57,13 +53,6 @@ function update_script() {
    cp -r /opt/nametag/public /opt/nametag/.next/standalone/public
    msg_ok "Rebuilt Application"

-    msg_info "Restoring Data"
-    cp /opt/nametag.env.bak /opt/nametag/.env
-    cp -r /opt/nametag_data_bak/. /opt/nametag/data/
-    rm -f /opt/nametag.env.bak
-    rm -rf /opt/nametag_data_bak
-    msg_ok "Restored Data"
-
    msg_info "Running Migrations"
    cd /opt/nametag
    $STD npx prisma migrate deploy
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-2048}"
 var_disk="${var_disk:-8}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_arm64="${var_arm64:-yes}"
 var_unprivileged="${var_unprivileged:-1}"

@@ -61,18 +61,16 @@ EOF
    systemctl stop overseerr
    msg_ok "Service stopped"

-    msg_info "Creating backup"
-    mv /opt/overseerr/config /opt/config_backup
-    msg_ok "Backup created"
+    create_backup /opt/overseerr/config

    fetch_and_deploy_gh_release "overseerr" "sct/overseerr" "tarball"
-    rm -rf /opt/overseerr/config
+
+    restore_backup

    msg_info "Configuring ${APP} (Patience)"
    cd /opt/overseerr
    $STD yarn install
    $STD yarn build
-    mv /opt/config_backup /opt/overseerr/config
    msg_ok "Configured ${APP}"

    msg_info "Starting Service"
@@ -35,23 +35,18 @@ function update_script() {
    systemctl stop ownfoil
    msg_ok "Stopped Service"

-    msg_info "Backing up Data"
-    cp -r /opt/ownfoil/app/config /opt/ownfoil_data_backup
-    msg_ok "Backed up Data"
+    create_backup /opt/ownfoil/app/config

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "ownfoil" "a1ex4/ownfoil" "tarball"

+    restore_backup
+
    msg_info "Installing Dependencies"
    cd /opt/ownfoil
    $STD source .venv/bin/activate
    $STD uv pip install -r requirements.txt
    msg_ok "Installed Dependencies"

-    msg_info "Restoring Data"
-    cp -r /opt/ownfoil_data_backup /opt/ownfoil/app/config
-    rm -rf /opt/ownfoil_data_backup
-    msg_ok "Restored Data"
-
    msg_info "Starting Service"
    systemctl start ownfoil
    msg_ok "Started Service"
@@ -6,7 +6,7 @@ source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxV
 # Source: https://pangolin.net/ | Github: https://github.com/fosrl/pangolin

 APP="Pangolin"
-PANGOLIN_VERSION="${PANGOLIN_VERSION:-1.20.0}"
+PANGOLIN_VERSION="${PANGOLIN_VERSION:-1.21.0}"
 var_tags="${var_tags:-proxy}"
 var_cpu="${var_cpu:-2}"
 var_ram="${var_ram:-4096}"
@@ -35,15 +35,11 @@ function update_script() {
    systemctl stop paperclip
    msg_ok "Stopped Service"

-    msg_info "Backing up Configuration"
-    cp /opt/paperclip-ai/.env /opt/paperclip.env.bak
-    msg_ok "Backed up Configuration"
+    create_backup /opt/paperclip-ai/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "paperclip-ai" "paperclipai/paperclip" "tarball"

-    msg_info "Restoring Configuration"
-    mv /opt/paperclip.env.bak /opt/paperclip-ai/.env
-    msg_ok "Restored Configuration"
+    restore_backup

    msg_info "Rebuilding Paperclip"
    cd /opt/paperclip-ai
@@ -35,22 +35,18 @@ function update_script() {
    systemctl stop papra
    msg_ok "Stopped Service"

-    msg_info "Backing up Configuration"
-    if [[ -f /opt/papra/apps/papra-server/.env ]]; then
-      cp /opt/papra/apps/papra-server/.env /opt/papra_env.bak
-    fi
-    msg_ok "Backed up Configuration"
+    create_backup /opt/papra/apps/papra-server/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "papra" "papra-hq/papra" "tarball"

+    restore_backup
+
    pnpm_version=$(grep -oP '"packageManager":\s*"pnpm@\K[^"]+' /opt/papra/package.json)
    NODE_VERSION="26" NODE_MODULE="pnpm@$pnpm_version" setup_nodejs

    msg_info "Building Application"
    cd /opt/papra
-    if [[ -f /opt/papra_env.bak ]]; then
-      cp /opt/papra_env.bak /opt/papra/apps/papra-server/.env
-    else
+    if [[ ! -f /opt/papra/apps/papra-server/.env ]]; then
      msg_warn ".env missing, regenerating from defaults"
      LOCAL_IP=$(hostname -I | awk '{print $1}')
      cat <<EOF >/opt/papra/apps/papra-server/.env
@@ -74,7 +70,6 @@ EOF
    $STD pnpm --filter "@papra/app-client..." run build
    $STD pnpm --filter "@papra/app-server..." run build
    ln -sf /opt/papra/apps/papra-client/dist /opt/papra/apps/papra-server/public
-    rm -f /opt/papra_env.bak
    msg_ok "Built Application"

    msg_info "Starting Service"
@@ -72,9 +72,13 @@ EOF
      msg_ok "Migration complete!"
    fi

+    create_backup /opt/patchmon/.env
+
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "PatchMon" "PatchMon/PatchMon" "singlefile" "latest" "/opt/patchmon" "patchmon-server-linux-$(arch_resolve)"
    mv /opt/patchmon/PatchMon /opt/patchmon/patchmon-server

+    restore_backup
+
    msg_info "Fetching PatchMon agent binaries"
    RELEASE=$(get_latest_github_release "PatchMon/PatchMon")
    [[ ! -d /opt/patchmon/agents ]] && mkdir -p /opt/patchmon/agents
@@ -41,8 +41,6 @@ function update_script() {

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "postiz" "gitroomhq/postiz-app" "tarball"

-    # Restore BEFORE the build: CLEAN_INSTALL wiped /opt/postiz including .env,
-    # and the build below sources it
    restore_backup

    msg_info "Building Application"
@@ -36,18 +36,14 @@ function update_script() {
  msg_ok "Updated PowerDNS"

  if check_for_gh_release "poweradmin" "poweradmin/poweradmin"; then
-    msg_info "Backing up Configuration"
-    cp /opt/poweradmin/config/settings.php /opt/poweradmin_settings.php.bak
-    cp /opt/poweradmin/powerdns.db /opt/poweradmin_powerdns.db.bak
-    msg_ok "Backed up Configuration"
+    create_backup /opt/poweradmin/config/settings.php /opt/poweradmin/powerdns.db

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "poweradmin" "poweradmin/poweradmin" "tarball"

+    restore_backup
+
    msg_info "Updating Poweradmin"
-    cp /opt/poweradmin_settings.php.bak /opt/poweradmin/config/settings.php
-    cp /opt/poweradmin_powerdns.db.bak /opt/poweradmin/powerdns.db
    rm -rf /opt/poweradmin/install
-    rm -f /opt/poweradmin_settings.php.bak /opt/poweradmin_powerdns.db.bak
    chown -R www-data:pdns /opt/poweradmin
    chmod 775 /opt/poweradmin
    chown pdns:pdns /opt/poweradmin/powerdns.db
@@ -34,17 +34,12 @@ function update_script() {
    systemctl stop radicale
    msg_ok "Stopped service"

-    msg_info "Backing up users file"
-    cp /opt/radicale/users /opt/radicale_users_backup
-    msg_ok "Backed up users file"
+    create_backup /opt/radicale/users

    PYTHON_VERSION="3.13" setup_uv
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Radicale" "Kozea/Radicale" "tarball" "latest" "/opt/radicale"

-    msg_info "Restoring users file"
-    rm -f /opt/radicale/users
-    mv /opt/radicale_users_backup /opt/radicale/users
-    msg_ok "Restored users file"
+    restore_backup

    if grep -q 'start.sh' /etc/systemd/system/radicale.service; then
      sed -i -e '/^Description/i[Unit]' \
@@ -36,10 +36,12 @@ function update_script() {

    ensure_dependencies git

-    cp /opt/reactive-resume/.env /opt/reactive-resume.env.bak
+    create_backup /opt/reactive-resume/.env
    NODE_VERSION="24" NODE_MODULE="corepack" setup_nodejs
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "reactive-resume" "amruthpillai/reactive-resume" "tarball" "latest" "/opt/reactive-resume"

+    restore_backup
+
    msg_info "Updating Reactive Resume (Patience)"
    cd /opt/reactive-resume
    export COREPACK_ENABLE_DOWNLOAD_PROMPT=0
@@ -49,7 +51,6 @@ function update_script() {
    export NODE_ENV="production"
    $STD pnpm install --frozen-lockfile
    $STD pnpm run build
-    mv /opt/reactive-resume.env.bak /opt/reactive-resume/.env
    msg_ok "Updated Reactive Resume"

    msg_info "Updating Service"
@@ -35,18 +35,11 @@ function update_script() {
    systemctl stop rustypaste
    msg_ok "Stopped Services"

-    msg_info "Creating Backup"
-    tar -czf "/opt/rustypaste_backup_$(date +%F).tar.gz" /opt/rustypaste/upload 2>/dev/null || true
-    cp /opt/rustypaste/config.toml /tmp/rustypaste_config.toml.bak
-    msg_ok "Backup Created"
+    create_backup /opt/rustypaste/upload /opt/rustypaste/config.toml

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "rustypaste" "orhun/rustypaste" "prebuild" "latest" "/opt/rustypaste" "*x86_64-unknown-linux-gnu.tar.gz"

-    msg_info "Restoring Data"
-    mv /tmp/rustypaste_config.toml.bak /opt/rustypaste/config.toml
-    tar -xzf "/opt/rustypaste_backup_$(date +%F).tar.gz" -C /opt/rustypaste/upload 2>/dev/null || true
-    rm -rf /opt/rustypaste_backup_$(date +%F).tar.gz
-    msg_ok "Restored Data"
+    restore_backup

    msg_info "Starting Services"
    systemctl start rustypaste
@@ -36,19 +36,16 @@ function update_script() {
    [[ -f /etc/systemd/system/scanopy-daemon.service ]] && systemctl stop scanopy-daemon
    msg_ok "Stopped services"

-    msg_info "Backing up configurations"
-    cp /opt/scanopy/.env /opt/scanopy.env
-    [[ -f /opt/scanopy/oidc.toml ]] && cp /opt/scanopy/oidc.toml /opt/scanopy.oidc.toml
-    msg_ok "Backed up configurations"
+    create_backup /opt/scanopy/.env /opt/scanopy/oidc.toml

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Scanopy" "scanopy/scanopy" "tarball" "latest" "/opt/scanopy"

+    restore_backup
+
    ensure_dependencies pkg-config libssl-dev
    TOOLCHAIN="$(grep "channel" /opt/scanopy/backend/rust-toolchain.toml | awk -F\" '{print $2}')"
    RUST_TOOLCHAIN=$TOOLCHAIN setup_rust

-    [[ -f /opt/scanopy.env ]] && mv /opt/scanopy.env /opt/scanopy/.env
-    [[ -f /opt/scanopy.oidc.toml ]] && mv /opt/scanopy.oidc.toml /opt/scanopy/oidc.toml
    if ! grep -q "PUBLIC_URL" /opt/scanopy/.env; then
      sed -i "\|_PATH=|a\\scanopy_PUBLIC_URL=http://${LOCAL_IP}:60072" /opt/scanopy/.env
    fi
@@ -52,11 +52,12 @@ function update_script() {
      msg_ok "Updated FlareSolverr"
    fi

-    cp /opt/shelfmark/start.sh /opt/start.sh.bak
+    create_backup /opt/shelfmark/start.sh
    if command -v chromedriver &>/dev/null; then
      $STD apt remove -y chromium-driver
    fi
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "shelfmark" "calibrain/shelfmark" "tarball" "latest" "/opt/shelfmark"
+    restore_backup
    RELEASE_VERSION=$(cat "$HOME/.shelfmark")

    msg_info "Updating Shelfmark"
@@ -74,7 +75,6 @@ function update_script() {
    else
      $STD uv sync --active --locked --no-default-groups
    fi
-    mv /opt/start.sh.bak /opt/shelfmark/start.sh
    msg_ok "Updated Shelfmark"

    msg_info "Starting Service(s)"
@@ -35,19 +35,11 @@ function update_script() {
    systemctl stop shlink
    msg_ok "Stopped Service"

-    msg_info "Backing up Data"
-    cp /opt/shlink/.env /opt/shlink.env.bak
-    cp -r /opt/shlink/data /opt/shlink_data_backup
-    msg_ok "Backed up Data"
+    create_backup /opt/shlink/.env /opt/shlink/data

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "shlink" "shlinkio/shlink" "prebuild" "latest" "/opt/shlink" "shlink*_php8.5_dist.zip"

-    msg_info "Restoring Data"
-    cp /opt/shlink.env.bak /opt/shlink/.env
-    rm -f /opt/shlink.env.bak
-    cp -r /opt/shlink_data_backup/. /opt/shlink/data
-    rm -rf /opt/shlink_data_backup
-    msg_ok "Restored Data"
+    restore_backup

    msg_info "Updating Application"
    cd /opt/shlink
@@ -36,19 +36,17 @@ function update_script() {
    [[ -f /etc/systemd/system/soularr.service ]] && systemctl stop soularr.timer soularr.service
    msg_ok "Stopped Service(s)"

-    msg_info "Backing up config"
-    cp /opt/slskd/config/slskd.yml /opt/slskd.yml.bak
-    msg_ok "Backed up config"
+    create_backup /opt/slskd/config/slskd.yml

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Slskd" "slskd/slskd" "prebuild" "latest" "/opt/slskd" "slskd-*-linux-$(arch_resolve "x64" "arm64").zip"

-    msg_info "Restoring config"
-    mv /opt/slskd.yml.bak /opt/slskd/config/slskd.yml
+    restore_backup

+    msg_info "Migrating config"
    # Migrate 0.25.0 breaking config key renames
    sed -i 's/^global:/transfers:/' /opt/slskd/config/slskd.yml
    sed -i 's/^integration:/integrations:/' /opt/slskd/config/slskd.yml
-    msg_ok "Restored config"
+    msg_ok "Migrated config"

    msg_info "Starting Service(s)"
    systemctl start slskd
@@ -63,13 +61,11 @@ function update_script() {
      msg_ok "Stopped Timer and Service"
    fi

-    msg_info "Backing up Soularr config"
-    cp /opt/soularr/config.ini /opt/soularr_config.ini.bak
-    cp /opt/soularr/run.sh /opt/soularr_run.sh.bak
-    msg_ok "Backed up Soularr config"
+    create_backup /opt/soularr/config.ini /opt/soularr/run.sh

    PYTHON_VERSION="3.11" setup_uv
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Soularr" "mrusse/soularr" "tarball" "latest" "/opt/soularr"
+    restore_backup
    msg_info "Updating Soularr"
    cd /opt/soularr
    $STD uv venv -c venv
@@ -78,11 +74,6 @@ function update_script() {
    deactivate
    msg_ok "Updated Soularr"

-    msg_info "Restoring Soularr config"
-    mv /opt/soularr_config.ini.bak /opt/soularr/config.ini
-    mv /opt/soularr_run.sh.bak /opt/soularr/run.sh
-    msg_ok "Restored Soularr config"
-
    msg_info "Starting Soularr Timer"
    systemctl restart soularr.timer
    msg_ok "Started Soularr Timer"
@@ -35,19 +35,11 @@ function update_script() {
    systemctl stop caddy
    msg_ok "Stopped Services"

-    msg_info "Backing up Data"
-    cp /opt/solidtime/.env /opt/solidtime.env.bak
-    cp -r /opt/solidtime/storage /opt/solidtime_storage_backup
-    msg_ok "Backed up Data"
+    create_backup /opt/solidtime/.env /opt/solidtime/storage

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "solidtime" "solidtime-io/solidtime" "tarball"

-    msg_info "Restoring Data"
-    cp /opt/solidtime.env.bak /opt/solidtime/.env
-    rm -f /opt/solidtime.env.bak
-    cp -r /opt/solidtime_storage_backup/. /opt/solidtime/storage
-    rm -rf /opt/solidtime_storage_backup
-    msg_ok "Restored Data"
+    restore_backup

    msg_info "Updating Application"
    cd /opt/solidtime
@@ -37,13 +37,12 @@ function update_script() {
    systemctl stop soulsync
    msg_ok "Stopped Service"

-    msg_info "Backing up Data"
-    mv /opt/soulsync/config /opt/soulsync-config.bak
-    mv /opt/soulsync/data /opt/soulsync-data.bak
-    msg_ok "Backed up Data"
+    create_backup /opt/soulsync/config /opt/soulsync/data

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "soulsync" "Nezreka/SoulSync" "tarball"

+    restore_backup
+
    msg_info "Updating Python Dependencies"
    cd /opt/soulsync
    $STD uv venv --clear /opt/soulsync/.venv --python 3.11
@@ -56,9 +55,6 @@ function update_script() {
    $STD npm run build
    msg_ok "Built WebUI"

-    mv /opt/soulsync-config.bak /opt/soulsync/config
-    mv /opt/soulsync-data.bak /opt/soulsync/data
-
    msg_info "Starting Service"
    systemctl start soulsync
    msg_ok "Started Service"
@@ -35,18 +35,12 @@ function update_script() {
    systemctl stop sparkyfitness-server nginx
    msg_ok "Stopped Services"

-    msg_info "Backing up data"
-    mkdir -p /opt/sparkyfitness_backup
-    if [[ -d /opt/sparkyfitness/SparkyFitnessServer/uploads ]]; then
-      cp -r /opt/sparkyfitness/SparkyFitnessServer/uploads /opt/sparkyfitness_backup/
-    fi
-    if [[ -d /opt/sparkyfitness/SparkyFitnessServer/backup ]]; then
-      cp -r /opt/sparkyfitness/SparkyFitnessServer/backup /opt/sparkyfitness_backup/
-    fi
-    msg_ok "Backed up data"
+    create_backup /opt/sparkyfitness/SparkyFitnessServer/uploads /opt/sparkyfitness/SparkyFitnessServer/backup

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "sparkyfitness" "CodeWithCJ/SparkyFitness" "tarball"

+    restore_backup
+
    PNPM_VERSION="$(jq -r '.packageManager | split("@")[1]' /opt/sparkyfitness/package.json)"
    NODE_VERSION="25" NODE_MODULE="pnpm@${PNPM_VERSION}" setup_nodejs

@@ -96,11 +90,6 @@ EOF
    systemctl daemon-reload
    msg_ok "Refreshed SparkyFitness Service"

-    msg_info "Restoring data"
-    cp -r /opt/sparkyfitness_backup/. /opt/sparkyfitness/SparkyFitnessServer/
-    rm -rf /opt/sparkyfitness_backup
-    msg_ok "Restored data"
-
    msg_info "Starting Services"
    $STD systemctl start sparkyfitness-server nginx
    msg_ok "Started Services"
@@ -35,16 +35,11 @@ function update_script() {
    systemctl stop spliit
    msg_ok "Stopped Service"

-    msg_info "Backing up Configuration"
-    rm -f /opt/spliit.env.bak
-    cp /opt/spliit/.env /opt/spliit.env.bak
-    msg_ok "Backed up Configuration"
+    create_backup /opt/spliit/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "spliit" "spliit-app/spliit" "tarball"

-    msg_info "Restoring Configuration"
-    cp /opt/spliit.env.bak /opt/spliit/.env
-    msg_ok "Restored Configuration"
+    restore_backup

    msg_info "Building Application"
    cd /opt/spliit
@@ -36,18 +36,16 @@ function update_script() {
    systemctl stop spoolman
    msg_ok "Stopped Service"

-    msg_info "Creating Backup"
-    [ -d /opt/spoolman_bak ] && rm -rf /opt/spoolman_bak
-    mv /opt/spoolman /opt/spoolman_bak
-    msg_ok "Created Backup"
+    create_backup /opt/spoolman/.env

-    fetch_and_deploy_gh_release "spoolman" "Donkie/Spoolman" "prebuild" "latest" "/opt/spoolman" "spoolman.zip"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "spoolman" "Donkie/Spoolman" "prebuild" "latest" "/opt/spoolman" "spoolman.zip"
+
+    restore_backup

    msg_info "Updating Spoolman"
    cd /opt/spoolman
    $STD uv sync --locked --no-install-project
    $STD uv sync --locked
-    cp /opt/spoolman_bak/.env /opt/spoolman
    sed -i 's|^ExecStart=.*|ExecStart=/usr/bin/bash /opt/spoolman/scripts/start.sh|' /etc/systemd/system/spoolman.service
    msg_ok "Updated Spoolman"

@@ -37,15 +37,11 @@ function update_script() {
    systemctl stop storyteller
    msg_ok "Stopped Service"

-    msg_info "Backing up Data"
-    cp /opt/storyteller/.env /opt/storyteller_env.bak
-    msg_ok "Backed up Data"
+    create_backup /opt/storyteller/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gl_release "storyteller" "storyteller-platform/storyteller" "tarball" "latest" "/opt/storyteller" "" "web-v2"

-    msg_info "Restoring Configuration"
-    mv /opt/storyteller_env.bak /opt/storyteller/.env
-    msg_ok "Restored Configuration"
+    restore_backup

    msg_info "Rebuilding Storyteller"
    cd /opt/storyteller
@@ -43,17 +43,15 @@ function update_script() {
    systemctl stop tandoor
    msg_ok "Stopped Service"

-    msg_info "Creating Backup"
-    mv /opt/tandoor /opt/tandoor.bak
-    msg_ok "Backup Created"
+    create_backup /opt/tandoor/config /opt/tandoor/api /opt/tandoor/mediafiles /opt/tandoor/staticfiles /opt/tandoor/.env

    NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs
    PYTHON_VERSION="3.13" setup_uv
-    fetch_and_deploy_gh_release "tandoor" "TandoorRecipes/recipes" "tarball" "latest" "/opt/tandoor"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "tandoor" "TandoorRecipes/recipes" "tarball" "latest" "/opt/tandoor"
+
+    restore_backup

    msg_info "Updating Tandoor"
-    cp -r /opt/tandoor.bak/{config,api,mediafiles,staticfiles} /opt/tandoor/
-    mv /opt/tandoor.bak/.env /opt/tandoor/.env
    cd /opt/tandoor
    $STD uv venv --clear .venv --python=python3
    $STD uv pip install -r requirements.txt --python .venv/bin/python
@@ -69,7 +67,6 @@ 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 Tandoor"

    msg_info "Starting Service"
@@ -36,13 +36,12 @@ function update_script() {
    systemctl stop tautulli
    msg_ok "Stopped Service"

-    msg_info "Backing up config and database"
-    cp /opt/Tautulli/config.ini /opt/tautulli_config.ini.backup
-    cp /opt/Tautulli/tautulli.db /opt/tautulli.db.backup
-    msg_ok "Backed up config and database"
+    create_backup /opt/Tautulli/config.ini /opt/Tautulli/tautulli.db

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Tautulli" "Tautulli/Tautulli" "tarball"

+    restore_backup
+
    msg_info "Updating Tautulli"
    cd /opt/Tautulli
    TAUTULLI_VERSION=$(get_latest_github_release "Tautulli/Tautulli" "false")
@@ -55,12 +54,6 @@ function update_script() {
    $STD uv pip install "setuptools<81"
    msg_ok "Updated Tautulli"

-    msg_info "Restoring config and database"
-    cp /opt/tautulli_config.ini.backup /opt/Tautulli/config.ini
-    cp /opt/tautulli.db.backup /opt/Tautulli/tautulli.db
-    rm -f /opt/{tautulli_config.ini.backup,tautulli.db.backup}
-    msg_ok "Restored config and database"
-
    msg_info "Starting Service"
    systemctl start tautulli
    msg_ok "Started Service"
@@ -36,15 +36,11 @@ function update_script() {
    systemctl stop teable
    msg_ok "Stopped Service"

-    msg_info "Backing up Configuration"
-    cp /opt/teable/.env /opt/teable.env.bak
-    msg_ok "Backed up Configuration"
+    create_backup /opt/teable/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "teable" "teableio/teable" "tarball"

-    msg_info "Restoring Configuration"
-    mv /opt/teable.env.bak /opt/teable/.env
-    msg_ok "Restored Configuration"
+    restore_backup

    msg_info "Rebuilding Teable"
    cd /opt/teable
@@ -34,16 +34,11 @@ function update_script() {
    systemctl stop teddycloud
    msg_ok "Stopped Service"

-    msg_info "Creating backup"
-    mv /opt/teddycloud /opt/teddycloud_bak
-    msg_ok "Backup created"
+    create_backup /opt/teddycloud/certs /opt/teddycloud/config /opt/teddycloud/data

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "teddycloud" "toniebox-reverse-engineering/teddycloud" "prebuild" "latest" "/opt/teddycloud" "teddycloud.amd64.release*.zip"

-    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"
+    restore_backup

    msg_info "Starting Service"
    systemctl start teddycloud
@@ -143,13 +143,12 @@ EOF
    fi
    msg_ok "Migrated Configuration"

-    msg_info "Backing up Data"
-    cp -r /opt/termix/data /opt/termix_data_backup
-    cp -r /opt/termix/uploads /opt/termix_uploads_backup
-    msg_ok "Backed up Data"
+    create_backup /opt/termix/data /opt/termix/uploads

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "termix" "Termix-SSH/Termix" "tarball"

+    restore_backup
+
    msg_info "Recreating Directories"
    mkdir -p /opt/termix/html \
      /opt/termix/nginx \
@@ -177,12 +176,6 @@ EOF
    $STD npm cache clean --force
    msg_ok "Set up Production Dependencies"

-    msg_info "Restoring Data"
-    cp -r /opt/termix_data_backup /opt/termix/data
-    cp -r /opt/termix_uploads_backup /opt/termix/uploads
-    rm -rf /opt/termix_data_backup /opt/termix_uploads_backup
-    msg_ok "Restored Data"
-
    msg_info "Updating Frontend Files"
    rm -rf /opt/termix/html/*
    cp -r /opt/termix/dist/* /opt/termix/html/ 2>/dev/null || true
@@ -36,12 +36,11 @@ function update_script() {
    systemctl stop tianji
    msg_ok "Stopped Service"

-    msg_info "Backing up data"
-    cp /opt/tianji/src/server/.env /opt/.env
-    mv /opt/tianji /opt/tianji_bak
-    msg_ok "Backed up data"
+    create_backup /opt/tianji/src/server/.env

-    fetch_and_deploy_gh_release "tianji" "msgbyte/tianji" "tarball"
+    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "tianji" "msgbyte/tianji" "tarball"
+
+    restore_backup

    msg_info "Updating Tianji"
    cd /opt/tianji
@@ -52,10 +51,8 @@ function update_script() {
    mkdir -p ./src/server/public
    cp -r ./geo ./src/server/public
    $STD pnpm build:server
-    mv /opt/.env /opt/tianji/src/server/.env
    cd src/server
    $STD pnpm db:migrate:apply
-    rm -rf /opt/tianji_bak
    rm -rf /opt/tianji/src/client
    rm -rf /opt/tianji/website
    rm -rf /opt/tianji/reporter
@@ -40,13 +40,12 @@ function update_script() {
    systemctl stop transmute
    msg_ok "Stopped Service"

-    msg_info "Backing up Data"
-    cp /opt/transmute/backend/.env /opt/transmute.env.bak
-    cp -r /opt/transmute/data /opt/transmute_data_bak
-    msg_ok "Backed up Data"
+    create_backup /opt/transmute/backend/.env /opt/transmute/data

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "transmute" "transmute-app/transmute" "tarball"

+    restore_backup
+
    msg_info "Updating Python Dependencies"
    cd /opt/transmute
    $STD uv venv --clear /opt/transmute/.venv
@@ -59,12 +58,6 @@ function update_script() {
    $STD npm run build
    msg_ok "Rebuilt Frontend"

-    msg_info "Restoring Data"
-    cp /opt/transmute.env.bak /opt/transmute/backend/.env
-    cp -r /opt/transmute_data_bak/. /opt/transmute/data/
-    rm -f /opt/transmute.env.bak
-    rm -rf /opt/transmute_data_bak
-    msg_ok "Restored Data"

    msg_info "Starting Service"
    systemctl start transmute
@@ -35,12 +35,12 @@ function update_script() {
    systemctl stop tubearchivist tubearchivist-celery tubearchivist-beat
    msg_ok "Stopped Services"

-    msg_info "Backing up Data"
-    cp /opt/tubearchivist/.env /opt/tubearchivist_env.bak
-    msg_ok "Backed up Data"
+    create_backup /opt/tubearchivist/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "tubearchivist" "tubearchivist/tubearchivist" "tarball"

+    restore_backup
+
    msg_info "Rebuilding Tube Archivist"
    cd /opt/tubearchivist/frontend
    $STD npm install
@@ -56,7 +56,6 @@ function update_script() {
    msg_ok "Rebuilt Tube Archivist"

    msg_info "Restoring Configuration"
-    mv /opt/tubearchivist_env.bak /opt/tubearchivist/.env
    sed -i 's|^TA_APP_DIR=/opt/tubearchivist$|TA_APP_DIR=/opt/tubearchivist/backend|' /opt/tubearchivist/.env
    sed -i 's|^TA_CACHE_DIR=/opt/tubearchivist/cache$|TA_CACHE_DIR=/cache|' /opt/tubearchivist/.env
    sed -i 's|^TA_MEDIA_DIR=/opt/tubearchivist/media$|TA_MEDIA_DIR=/youtube|' /opt/tubearchivist/.env
@@ -34,9 +34,9 @@ function update_script() {
    systemctl stop umami
    msg_ok "Stopped Service"

-    mv /opt/umami/.env /opt/.env.bak
+    create_backup /opt/umami/.env
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "umami" "umami-software/umami" "tarball"
-    mv /opt/.env.bak /opt/umami/.env
+    restore_backup

    msg_info "Updating Umami"
    cd /opt/umami
@@ -34,9 +34,9 @@ function update_script() {
    systemctl stop umlautadaptarr
    msg_ok "Stopped Service"

-    cp /opt/UmlautAdaptarr/appsettings.json /opt/UmlautAdaptarr/appsettings.json.bak
+    create_backup /opt/UmlautAdaptarr/appsettings.json
    fetch_and_deploy_gh_release "UmlautAdaptarr" "PCJones/Umlautadaptarr" "prebuild" "latest" "/opt/UmlautAdaptarr" "linux-x64.zip"
-    cp /opt/UmlautAdaptarr/appsettings.json.bak /opt/UmlautAdaptarr/appsettings.json
+    restore_backup

    msg_info "Starting Service"
    systemctl start umlautadaptarr
@@ -38,16 +38,11 @@ function update_script() {
    systemctl stop nginx php8.3-fpm
    msg_ok "Stopped Services"

-    msg_info "Creating Backup"
-    cp /opt/wallabag/app/config/parameters.yml /tmp/wallabag_parameters.yml.bak
-    msg_ok "Created Backup"
+    create_backup /opt/wallabag/app/config/parameters.yml

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "wallabag" "wallabag/wallabag" "prebuild" "latest" "/opt/wallabag" "wallabag-*.tar.gz"

-    msg_info "Restoring Configuration"
-    cp /tmp/wallabag_parameters.yml.bak /opt/wallabag/app/config/parameters.yml
-    rm -f /tmp/wallabag_parameters.yml.bak
-    msg_ok "Restored Configuration"
+    restore_backup

    msg_info "Running Migrations"
    cd /opt/wallabag
@@ -39,19 +39,12 @@ function update_script() {
    systemctl stop wealthfolio
    msg_ok "Stopped Service"

-    msg_info "Backing up Data"
-    cp -r /opt/wealthfolio_data /opt/wealthfolio_data_backup
-    cp /opt/wealthfolio/.env /opt/wealthfolio_env_backup
-    msg_ok "Backed up Data"
+    create_backup /opt/wealthfolio_data /opt/wealthfolio/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "wealthfolio" "wealthfolio/wealthfolio" "prebuild" "latest" "/opt/wealthfolio" "wealthfolio-server-*-linux-amd64.tar.gz"
-    install -m 755 /opt/wealthfolio/wealthfolio-server /usr/local/bin/wealthfolio-server

-    msg_info "Restoring Data"
-    cp -r /opt/wealthfolio_data_backup/. /opt/wealthfolio_data
-    cp /opt/wealthfolio_env_backup /opt/wealthfolio/.env
-    rm -rf /opt/wealthfolio_data_backup /opt/wealthfolio_env_backup
-    msg_ok "Restored Data"
+    restore_backup
+    install -m 755 /opt/wealthfolio/wealthfolio-server /usr/local/bin/wealthfolio-server

    msg_info "Starting Service"
    systemctl start wealthfolio
@@ -34,16 +34,12 @@ function update_script() {
    systemctl stop web-check
    msg_ok "Stopped Service"

-    msg_info "Creating backup"
-    mv /opt/web-check/.env /opt
-    msg_ok "Created backup"
+    create_backup /opt/web-check/.env

    NODE_VERSION="22" NODE_MODULE="yarn" setup_nodejs
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "web-check" "Lissy93/web-check" "tarball"

-    msg_info "Restoring backup"
-    mv /opt/.env /opt/web-check
-    msg_ok "Restored backup"
+    restore_backup

    msg_info "Building Web-Check"
    cd /opt/web-check 
@@ -36,17 +36,12 @@ function update_script() {
    systemctl stop caddy php${PHP_VER}-fpm
    msg_ok "Stopped Service"

-    msg_info "Backing up Data"
-    cp -r /opt/webtrees/data /opt/webtrees_data_backup
-    msg_ok "Backed up Data"
+    create_backup /opt/webtrees/data

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "webtrees" "fisharebest/webtrees" "prebuild" "latest" "/opt/webtrees" "webtrees-*.zip"

-    msg_info "Restoring Data"
-    cp -r /opt/webtrees_data_backup/. /opt/webtrees/data
-    rm -rf /opt/webtrees_data_backup
+    restore_backup
    chown -R www-data:www-data /opt/webtrees
-    msg_ok "Restored Data"

    msg_info "Starting Service"
    systemctl start caddy php${PHP_VER}-fpm
@@ -35,16 +35,13 @@ function update_script() {
    systemctl stop wishlist
    msg_ok "Stopped Service"

-    msg_info "Creating Backup"
-    mkdir -p /opt/wishlist-backup
-    cp /opt/wishlist/.env /opt/wishlist-backup/.env
-    cp -a /opt/wishlist/uploads /opt/wishlist-backup
-    cp -a /opt/wishlist/data /opt/wishlist-backup
-    msg_ok "Created Backup"
+    create_backup /opt/wishlist/.env /opt/wishlist/uploads /opt/wishlist/data

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "wishlist" "cmintey/wishlist" "tarball"
    LATEST_APP_VERSION=$(get_latest_github_release "cmintey/wishlist")

+    restore_backup
+
    msg_info "Updating Wishlist"
    cd /opt/wishlist
    $STD pnpm install --frozen-lockfile
@@ -56,13 +53,6 @@ function update_script() {
    $STD pnpm run build
    $STD pnpm prune --prod
    chmod +x /opt/wishlist/entrypoint.sh
-
-    msg_info "Restoring Backup"
-    cp /opt/wishlist-backup/.env /opt/wishlist/.env
-    cp -a /opt/wishlist-backup/uploads /opt/wishlist
-    cp -a /opt/wishlist-backup/data /opt/wishlist
-    rm -rf /opt/wishlist-backup
-    msg_ok "Restored Backup"
    
    msg_ok "Updated Wishlist"
    msg_info "Starting Service"
@@ -35,19 +35,11 @@ function update_script() {
    systemctl stop writefreely
    msg_ok "Stopped Services"

-    msg_info "Creating Backup"
-    mkdir -p /tmp/writefreely_backup
-    cp /opt/writefreely/keys /tmp/writefreely_backup/ 2>/dev/null
-    cp /opt/writefreely/config.ini /tmp/writefreely_backup/ 2>/dev/null
-    msg_ok "Created Backup"
+    create_backup /opt/writefreely/keys /opt/writefreely/config.ini

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "writefreely" "writefreely/writefreely" "prebuild" "latest" "/opt/writefreely" "writefreely_*_linux_$(arch_resolve).tar.gz"

-    msg_info "Restoring Data"
-    cp /tmp/writefreely_backup/config.ini /opt/writefreely/ 2>/dev/null
-    cp /tmp/writefreely_backup/keys/* /opt/writefreely/keys/ 2>/dev/null
-    rm -rf /tmp/writefreely_backup
-    msg_ok "Restored Data"
+    restore_backup

    msg_info "Running Post-Update Tasks"
    cd /opt/writefreely
@@ -35,13 +35,12 @@ function update_script() {
    systemctl stop xyops
    msg_ok "Stopped Service"

-    msg_info "Backing up Data"
-    cp -r /opt/xyops/data /opt/xyops_data_backup
-    cp -r /opt/xyops/conf /opt/xyops_conf_backup
-    msg_ok "Backed up Data"
+    create_backup /opt/xyops/data /opt/xyops/conf

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "xyops" "pixlcore/xyops" "tarball"

+    restore_backup
+
    msg_info "Rebuilding Application"
    cd /opt/xyops
    $STD npm install
@@ -49,12 +48,6 @@ function update_script() {
    chmod 644 /opt/xyops/node_modules/useragent-ng/lib/regexps.js
    msg_ok "Rebuilt Application"

-    msg_info "Restoring Data"
-    cp -r /opt/xyops_data_backup/. /opt/xyops/data
-    cp -r /opt/xyops_conf_backup/. /opt/xyops/conf
-    rm -rf /opt/xyops_data_backup /opt/xyops_conf_backup
-    msg_ok "Restored Data"
-
    msg_info "Starting Service"
    systemctl start xyops
    msg_ok "Started Service"
@@ -36,22 +36,17 @@ function update_script() {
    systemctl stop yamtrack yamtrack-celery
    msg_ok "Stopped Services"

-    msg_info "Backing up Data"
-    cp /opt/yamtrack/src/.env /opt/yamtrack_env.bak
-    msg_ok "Backed up Data"
+    create_backup /opt/yamtrack/src/.env

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "yamtrack" "FuzzyGrim/Yamtrack" "tarball"

+    restore_backup
+
    msg_info "Installing Python Dependencies"
    cd /opt/yamtrack
    $STD uv sync --locked
    msg_ok "Installed Python Dependencies"

-    msg_info "Restoring Data"
-    cp /opt/yamtrack_env.bak /opt/yamtrack/src/.env
-    rm -f /opt/yamtrack_env.bak
-    msg_ok "Restored Data"
-
    msg_info "Updating Yamtrack"
    cd /opt/yamtrack/src
    $STD /opt/yamtrack/.venv/bin/python manage.py migrate
@@ -35,17 +35,12 @@ function update_script() {
    systemctl stop nginx
    msg_ok "Stopped Service"

-    msg_info "Backing up Configuration"
-    cp -r /opt/yourls/user /opt/yourls_user.bak
-    msg_ok "Backed up Configuration"
+    create_backup /opt/yourls/user

    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "yourls" "YOURLS/YOURLS" "tarball"
-    chown -R www-data:www-data /opt/yourls

-    msg_info "Restoring Configuration"
-    cp -r /opt/yourls_user.bak/. /opt/yourls/user/
-    rm -rf /opt/yourls_user.bak
-    msg_ok "Restored Configuration"
+    restore_backup
+    chown -R www-data:www-data /opt/yourls

    msg_info "Starting Service"
    systemctl start nginx
@@ -35,14 +35,14 @@ function update_script() {
    systemctl stop zerobyte
    msg_ok "Stopped Service"

-    msg_info "Backing up Configuration"
-    cp /opt/zerobyte/.env /opt/zerobyte.env.bak
-    msg_ok "Backed up Configuration"
+    create_backup /opt/zerobyte/.env
    
    ensure_dependencies git
    NODE_VERSION="24" setup_nodejs
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "zerobyte" "nicotsx/zerobyte" "tarball"

+    restore_backup
+
    msg_info "Building Zerobyte"
    export NODE_OPTIONS="--max-old-space-size=3072"
    cd /opt/zerobyte
@@ -50,11 +50,6 @@ function update_script() {
    $STD node ./node_modules/vite/bin/vite.js build
    msg_ok "Built Zerobyte"

-    msg_info "Restoring Configuration"
-    cp /opt/zerobyte.env.bak /opt/zerobyte/.env
-    rm -f /opt/zerobyte.env.bak
-    msg_ok "Restored Configuration"
-
    msg_info "Starting Service"
    systemctl start zerobyte
    msg_ok "Started Service"
@@ -37,24 +37,24 @@ function update_script() {

    msg_info "Creating Backup"
    ensure_dependencies zstd
-    mkdir -p /opt/{backups,z2m_backup}
+    mkdir -p /opt/backups
    BACKUP_VERSION="$(<"$HOME/.zigbee2mqtt")"
    BACKUP_FILE="/opt/backups/${APP}_backup_${BACKUP_VERSION}.tar.zst"
    $STD tar -cf - -C /opt zigbee2mqtt | zstd -q -o "$BACKUP_FILE"
    ls -t /opt/backups/${APP}_backup_*.tar.zst 2>/dev/null | tail -n +6 | xargs -r rm -f
-    mv /opt/zigbee2mqtt/data /opt/z2m_backup/data
    msg_ok "Backup Created (${BACKUP_VERSION})"

+    create_backup /opt/zigbee2mqtt/data
+
    CLEAN_INSTALL=1 fetch_and_deploy_gh_release "Zigbee2MQTT" "Koenkk/zigbee2mqtt" "tarball" "latest" "/opt/zigbee2mqtt"

+    restore_backup
+
    msg_info "Updating Zigbee2MQTT"
-    rm -rf /opt/zigbee2mqtt/data
-    mv /opt/z2m_backup/data /opt/zigbee2mqtt
    cd /opt/zigbee2mqtt
    grep -q "^packageImportMethod" ./pnpm-workspace.yaml 2>/dev/null || 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"
@@ -24,6 +24,11 @@ if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
  exit 10
 fi

+msg_info "Switching SSH to classic (non-socket-activated) mode"
+systemctl disable --now ssh.socket &>/dev/null || true
+systemctl enable --now ssh &>/dev/null || true
+msg_ok "Switched SSH to classic mode"
+
 msg_info "Installing NextCloudPi (Patience)"
 $STD bash <(curl -fsSL https://raw.githubusercontent.com/nextcloud/nextcloudpi/master/install.sh)
 msg_ok "Installed NextCloudPi"
@@ -22,7 +22,7 @@ msg_ok "Installed Dependencies"
 NODE_VERSION="24" setup_nodejs
 PG_VERSION="17" setup_postgresql
 PG_DB_NAME="pangolin" PG_DB_USER="pangolin" setup_postgresql_db
-PANGOLIN_VERSION="${PANGOLIN_VERSION:-1.20.0}"
+PANGOLIN_VERSION="${PANGOLIN_VERSION:-1.21.0}"
 fetch_and_deploy_gh_release "pangolin" "fosrl/pangolin" "tarball" "$PANGOLIN_VERSION"
 fetch_and_deploy_gh_release "gerbil" "fosrl/gerbil" "singlefile" "latest" "/usr/bin" "gerbil_linux_$(arch_resolve)"
 fetch_and_deploy_gh_release "traefik" "traefik/traefik" "prebuild" "latest" "/usr/bin" "traefik_v*_linux_$(arch_resolve).tar.gz"
@@ -2689,7 +2689,7 @@ fetch_and_deploy_gh_tag() {

  local tmpdir
  tmpdir=$(mktemp -d) || return 1
-  trap 'rm -rf "$tmpdir"' RETURN
+  trap 'rm -rf "$tmpdir"; trap - RETURN' RETURN
  local tarball_url="https://github.com/${repo}/archive/refs/tags/${version}.tar.gz"
  local filename="${app_lc}-${version}.tar.gz"

@@ -2866,7 +2866,7 @@ fetch_and_deploy_gl_tag() {

  local tmpdir
  tmpdir=$(mktemp -d) || return 1
-  trap 'rm -rf "$tmpdir"' RETURN
+  trap 'rm -rf "$tmpdir"; trap - RETURN' RETURN
  local filename="${app_lc}-${version_safe}.tar.gz"

  msg_info "Fetching GitLab tag: ${app} (${resolved_tag})"
@@ -2974,7 +2974,7 @@ check_for_gh_release() {

  local gh_check_json=""
  gh_check_json=$(mktemp /tmp/tools-gh-check-XXXXXX) || return 73
-  trap 'rm -f "${gh_check_json:-}"' RETURN
+  trap 'rm -f "${gh_check_json:-}"; trap - RETURN' RETURN

  # Build auth header if token is available
  local header_args=()
@@ -3574,7 +3574,7 @@ fetch_and_deploy_codeberg_release() {

    local tmpdir
    tmpdir=$(mktemp -d) || return 252
-    trap 'rm -rf "$tmpdir"' RETURN
+    trap 'rm -rf "$tmpdir"; trap - RETURN' RETURN

    msg_info "Fetching Codeberg tag: $app ($tag_name)"

@@ -3616,7 +3616,7 @@ fetch_and_deploy_codeberg_release() {

  local codeberg_rel_json
  codeberg_rel_json=$(mktemp /tmp/tools-codeberg-rel-XXXXXX) || return 73
-  trap 'rm -f "$codeberg_rel_json"; rm -rf "${tmpdir:-}" "${unpack_tmp:-}"' RETURN
+  trap 'rm -f "$codeberg_rel_json"; rm -rf "${tmpdir:-}" "${unpack_tmp:-}"; trap - RETURN' RETURN

  local attempt=0 success=false resp http_code

@@ -4113,7 +4113,7 @@ fetch_and_deploy_gh_release() {

  local tmpdir
  tmpdir=$(mktemp -d) || return 1
-  trap 'rm -rf "$tmpdir" "${unpack_tmp:-}"' RETURN
+  trap 'rm -rf "$tmpdir" "${unpack_tmp:-}"; trap - RETURN' RETURN
  local filename="" url=""

  msg_info "Fetching GitHub release: $app ($version)"
@@ -9218,7 +9218,7 @@ fetch_and_deploy_from_url() {
    msg_error "Failed to create temporary directory"
    return 252
  }
-  trap 'rm -rf "$tmpdir" "${unpack_tmp:-}"' RETURN
+  trap 'rm -rf "$tmpdir" "${unpack_tmp:-}"; trap - RETURN' RETURN

  curl -fsSL -o "$tmpdir/$filename" "$url" || {
    msg_error "Download failed: $url"
@@ -9434,7 +9434,7 @@ check_for_gl_release() {

  local gl_check_json
  gl_check_json=$(mktemp /tmp/tools-gl-check-XXXXXX) || return 73
-  trap 'rm -f "$gl_check_json"' RETURN
+  trap 'rm -f "$gl_check_json"; trap - RETURN' RETURN

  local repo_encoded
  repo_encoded=$(printf '%s' "$source" | sed 's|/|%2F|g')
@@ -9724,7 +9724,7 @@ fetch_and_deploy_gl_release() {

  local gl_rel_json
  gl_rel_json=$(mktemp /tmp/tools-gl-rel-XXXXXX) || return 73
-  trap 'rm -f "$gl_rel_json"; rm -rf "${tmpdir:-}" "${unpack_tmp:-}"' RETURN
+  trap 'rm -f "$gl_rel_json"; rm -rf "${tmpdir:-}" "${unpack_tmp:-}"; trap - RETURN' RETURN

  local repo_encoded
  repo_encoded=$(printf '%s' "$repo" | sed 's|/|%2F|g')
@@ -25,7 +25,6 @@ METHOD=""
 NSAPP="opnsense-vm"
 var_os="opnsense"
 var_version="26.7"
-FREEBSD_MAJOR="15"
 #
 GEN_MAC=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
 GEN_MAC_LAN=02:$(openssl rand -hex 5 | awk '{print toupper($0)}' | sed 's/\(..\)/\1:/g; s/.$//')
@@ -491,7 +490,7 @@ function advanced_settings() {
        fi
        echo -e "${DGN}Using LAN GATEWAY ADDRESS: ${BGN}$LAN_GW${CL}"
      fi
-      if NETMASK=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a LAN netmask (24 for example)" 8 58 $NETMASK --title "LAN NETMASK" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if NETMASK=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a LAN netmmask (24 for example)" 8 58 $NETMASK --title "LAN NETMASK" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
        if [ -z $NETMASK ]; then
          echo -e "${DGN}Netmask needs to be set if ip is not dhcp${CL}"
        fi
@@ -559,7 +558,7 @@ function advanced_settings() {
      else
        exit-script
      fi
-      if WAN_NETMASK=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a WAN netmask (24 for example)" 8 58 $WAN_NETMASK --title "WAN NETMASK" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+      if WAN_NETMASK=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a WAN netmmask (24 for example)" 8 58 $WAN_NETMASK --title "WAN NETMASK" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
        if [ -z $WAN_NETMASK ]; then
          echo -e "${DGN}WAN Netmask needs to be set if ip is not dhcp${CL}"
        fi
@@ -575,7 +574,7 @@ function advanced_settings() {
  else
    exit-script
  fi
-  if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a LAN MAC Address" 8 58 $GEN_MAC --title "LAN MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+  if MAC1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a WAN MAC Address" 8 58 $GEN_MAC --title "WAN MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
    if [ -z $MAC1 ]; then
      MAC="$GEN_MAC"
    else
@@ -586,7 +585,7 @@ function advanced_settings() {
    exit-script
  fi

-  if MAC2=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a WAN MAC Address" 8 58 $GEN_MAC_LAN --title "WAN MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
+  if MAC2=$(whiptail --backtitle "Proxmox VE Helper Scripts" --inputbox "Set a LAN MAC Address" 8 58 $GEN_MAC_LAN --title "LAN MAC ADDRESS" --cancel-button Exit-Script 3>&1 1>&2 2>&3); then
    if [ -z $MAC2 ]; then
      WAN_MAC="$GEN_MAC_LAN"
    else
@@ -653,26 +652,23 @@ fi
 msg_ok "Using ${CL}${BL}$STORAGE${CL} ${GN}for Storage Location."
 msg_ok "Virtual Machine ID is ${CL}${BL}$VMID${CL}."
 msg_info "Retrieving the URL for the OPNsense Qcow2 Disk Image"
-# Use latest stable FreeBSD amd64 qcow2 VM image matching FREEBSD_MAJOR
+# Use latest stable FreeBSD amd64 qcow2 VM image (generic, not UFS/ZFS)
 RELEASE_LIST="$(curl -s https://download.freebsd.org/releases/VM-IMAGES/ |
-  grep -Eo "${FREEBSD_MAJOR}\.[0-9]+-RELEASE" |
+  grep -Eo '[0-9]+\.[0-9]+-RELEASE' |
  sort -Vr |
  uniq)"
 URL=""
 FREEBSD_VER=""
 for ver in $RELEASE_LIST; do
-  # FreeBSD 15+ publishes separate -ufs/-zfs images instead of a generic one
-  for variant in "" "-ufs" "-zfs"; do
-    candidate="https://download.freebsd.org/releases/VM-IMAGES/${ver}/amd64/Latest/FreeBSD-${ver}-amd64${variant}.qcow2.xz"
-    if curl -fsI "$candidate" >/dev/null 2>&1; then
-      FREEBSD_VER="$ver"
-      URL="$candidate"
-      break 2
-    fi
-  done
+  candidate="https://download.freebsd.org/releases/VM-IMAGES/${ver}/amd64/Latest/FreeBSD-${ver}-amd64.qcow2.xz"
+  if curl -fsI "$candidate" >/dev/null 2>&1; then
+    FREEBSD_VER="$ver"
+    URL="$candidate"
+    break
+  fi
 done
 if [ -z "$URL" ]; then
-  msg_error "Could not find a FreeBSD ${FREEBSD_MAJOR}.x amd64 qcow2 image."
+  msg_error "Could not find generic FreeBSD amd64 qcow2 image (non-UFS/ZFS)."
  exit 115
 fi
 msg_ok "Download URL: ${CL}${BL}${URL}${CL}"
@@ -772,7 +768,7 @@ DESCRIPTION=$(
  cat <<EOF
 <div align='center'>
  <a href='https://community-scripts.org' target='_blank' rel='noopener noreferrer'>
-    <img src='https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/images/logo-81x112.png' alt='Logo' style='width:81px;height:112px;'/>
+    <img src='https://raw.githubusercontent.com/michelroegl-brunner/ProxmoxVE/refs/heads/develop/misc/images/logo-81x112.png' alt='Logo' style='width:81px;height:112px;'/>
  </a>

  <h2 style='font-size: 24px; margin: 20px 0;'>OPNsense VM</h2>
@@ -818,70 +814,10 @@ if [ -n "$WAN_BRG" ]; then
  msg_ok "WAN interface added"
  sleep 5 # Brief pause after adding network interface
 fi
-# FreeBSD 15+ VM images ship the base system as pkgbase packages; the bootstrap's
-# "delete all packages" step would remove the running base system (/bin/rm etc.)
-# and brick the VM. Deregister them from the pkg db first - the files stay in
-# place and OPNsense replaces base and kernel with its own sets afterwards.
-send_line_to_vm "echo \"PRAGMA foreign_keys=ON; DELETE FROM packages WHERE name LIKE 'FreeBSD-%';\" | pkg shell"
-sleep 5
-send_line_to_vm "sh ./opnsense-bootstrap.sh.in -y -f -r ${var_version}"
+send_line_to_vm "sh ./opnsense-bootstrap.sh.in -y -f -r 26.7"
 msg_ok "OPNsense VM is being installed, do not close the terminal, or the installation will fail."
-# The bootstrap ends with an automatic reboot into OPNsense. While it runs the
-# console keeps changing (download progress, package installs); once the VM has
-# settled at the login prompt the screen stays static. Poll a screendump hash
-# and continue after 3 minutes without change, bounded by a floor (the build
-# never finishes faster) and a ceiling for slow machines. If no screendump can
-# be captured at all, fall back to a fixed wait.
-SCREEN_PPM="${TEMP_DIR}/screen-${VMID}.ppm"
-
-function screen_hash() {
-  # Remove the previous dump first: a stale file from an earlier successful
-  # dump must not simulate a static screen when later dumps start failing.
-  # Note: "qm monitor" is unusable here - its readline attaches to /dev/tty
-  # even with piped stdin and captures the terminal, so use the API instead.
-  rm -f "$SCREEN_PPM"
-  timeout 10 pvesh create /nodes/$(hostname -s)/qemu/$VMID/monitor --command "screendump ${SCREEN_PPM}" >/dev/null 2>&1 || true
-  md5sum "$SCREEN_PPM" 2>/dev/null | cut -d' ' -f1 || true
-}
-
-build_elapsed=300
-build_stable=0
-screen_ok=0
-hash_a=""
-hash_b=""
-sleep 300
-while [ $build_stable -lt 6 ] && [ $build_elapsed -lt 2400 ]; do
-  sleep 30
-  build_elapsed=$((build_elapsed + 30))
-  new_hash=$(screen_hash)
-  if [ -n "$new_hash" ]; then
-    screen_ok=1
-    # The login prompt cursor may blink: a screen alternating between the same
-    # two frames (A/B/A/B) counts as stable, anything new resets the counter
-    if [ "$new_hash" = "$hash_a" ] || [ "$new_hash" = "$hash_b" ]; then
-      build_stable=$((build_stable + 1))
-    else
-      build_stable=0
-    fi
-  else
-    build_stable=0
-  fi
-  hash_b="$hash_a"
-  hash_a="$new_hash"
-  if [ -n "$new_hash" ]; then
-    echo -e "${DGN}Waiting for OPNsense build: ${YW}$((build_elapsed / 60))min elapsed, screen ${new_hash:0:8}, stable ${build_stable}/6${CL}"
-  else
-    echo -e "${DGN}Waiting for OPNsense build: ${YW}$((build_elapsed / 60))min elapsed, screendump failed${CL}"
-  fi
-  # No working screendump after several attempts: fixed wait instead
-  if [ $screen_ok -eq 0 ] && [ $build_elapsed -ge 480 ]; then
-    msg_error "Console screendump not available on this system - falling back to a fixed wait (12 minutes)."
-    sleep 720
-    build_elapsed=$((build_elapsed + 720))
-    break
-  fi
-done
-msg_ok "OPNsense build finished after $((build_elapsed / 60)) minutes"
+#We need to wait for the OPNsense build proccess to finish, this takes a few minutes
+sleep 1000
 send_line_to_vm "root"
 send_line_to_vm "opnsense"
 send_line_to_vm "2"
@@ -919,8 +855,8 @@ if [ -n "$WAN_BRG" ] && [ "$WAN_IP_ADDR" != "" ]; then
  send_line_to_vm "2"
  send_line_to_vm "n"
  send_line_to_vm "${WAN_IP_ADDR}"
-  send_line_to_vm "${WAN_NETMASK}"
-  send_line_to_vm "${WAN_GW}"
+  send_line_to_vm "${NETMASK}"
+  send_line_to_vm "${LAN_GW}"
  send_line_to_vm "n"
  send_line_to_vm " "
  send_line_to_vm "n"
Author	SHA1	Message	Date
MickLesk	5113c2fe58	Work around nextcloudpi's broken ssh.socket restart on Debian 13 Debian 13's openssh-server ships socket-activated by default. NCP's own bin/ncp/NETWORKING/SSH.sh detects that (systemctl is-active ssh.socket) but then runs "systemctl restart ssh" in that branch instead of reloading, which collides with the port ssh.socket already holds and fails with "Job for ssh.service failed" (#15944). Switch the container to classic ssh.service before handing off to their installer so it takes the safe "systemctl reload ssh" branch instead.	2026-07-21 23:23:25 +02:00
MickLesk	7c42e757c3	Revert installer pin, track master again master now targets trixie itself (matches the Debian 13 bump), and the only tagged trixie ref was an RC explicitly marked "expect bugs". Tracking master gets upstream trixie fixes as they land instead of being stuck on a stale test release.	2026-07-21 23:16:02 +02:00
MickLesk	73666ef855	Bump NextCloudPi to Debian 13, matching upstream's trixie move Upstream's master ncp.cfg now targets release "trixie" (Debian 13); bookworm (Debian 12) is no longer in the supported check_distro list at all. Move our own default to Debian 13 and pin the installer ref to v1.58.0-rc1, the only tagged ref with release=trixie so far (no stable trixie release exists yet upstream).	2026-07-21 23:14:52 +02:00
MickLesk	c780fd7dfa	Actually pin the branch nextcloudpi's install.sh clones internally install.sh is only a thin bootstrapper: it clones BRANCH (default "master") of the nextcloudpi repo itself and runs the real installer from that fresh checkout, including the distro-support check. Fetching install.sh from a pinned tag alone left BRANCH defaulting to "master", so the internally-cloned code was unaffected and still failed with "distro not supported" - confirmed by testing the previous fix. Pass BRANCH explicitly so the internal clone also targets the pinned tag.	2026-07-21 23:08:01 +02:00
MickLesk	99f9949251	Pin NextCloudPi installer to last known-good stable release The floating "master" branch of nextcloud/nextcloudpi's install.sh started rejecting our default Debian 12 base with "distro not supported" (#15944) after a regression landed upstream; the script is third-party code we don't audit or control. Pin to v1.57.1, the latest stable (non-prerelease) release, which explicitly targets Debian bookworm and predates the regression.	2026-07-21 22:57:50 +02:00
MickLesk	3f7283ab66	Clear RETURN traps after temp cleanup Updates temp-file and temp-dir cleanup traps in `misc/tools.func` to unset the `RETURN` trap after running cleanup. This prevents stale RETURN traps from leaking into later function returns and avoids repeated or unintended cleanup behavior in nested helper flows.	2026-07-21 22:49:58 +02:00
community-scripts-pr-app[bot]	71d69ea156	Update CHANGELOG.md (#15946 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2026-07-21 10:53:10 +00:00
CanbiZ (MickLesk)	bd3e3bd5f9	Standardize CT update backup handling (#15937 )	2026-07-21 12:52:51 +02:00
community-scripts-pr-app[bot]	d8efbd04d8	Update CHANGELOG.md (#15945 ) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>	2026-07-21 10:52:39 +00:00
CanbiZ (MickLesk)	e45d4c6349	Pangolin: Bump Version to 1.21.0 (#15938 )	2026-07-21 12:52:18 +02:00