Refactor code structure for improved readability and maintainabilit

CHANGELOG.md

@@ -491,24 +491,10 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
     - kasm: fix release detection [@CrazyWolf13](https://github.com/CrazyWolf13) ([#15151](https://github.com/community-scripts/ProxmoxVE/pull/15151))
 
-  - #### ✨ New Features
-
-    - trek: update install and upgrade workflow for v3.1.0 [@MickLesk](https://github.com/MickLesk) ([#15165](https://github.com/community-scripts/ProxmoxVE/pull/15165))
-
   - #### 💥 Breaking Changes
 
     - TREK: Pin version [@tremor021](https://github.com/tremor021) ([#15156](https://github.com/community-scripts/ProxmoxVE/pull/15156))
 
-  - #### 🔧 Refactor
-
-    - chore(paperless-ngx): pin version to prevent v3 update [@tomfrenzel](https://github.com/tomfrenzel) ([#15171](https://github.com/community-scripts/ProxmoxVE/pull/15171))
-
-### 🧰 Tools
-
-  - #### 🐞 Bug Fixes
-
-    - immich public proxy: replace npm install with npm ci for consistent dependency installation [@MickLesk](https://github.com/MickLesk) ([#15166](https://github.com/community-scripts/ProxmoxVE/pull/15166))
-
 ## 2026-06-16
 
 ### 🆕 New Scripts

ct/crafty-controller.sh

@@ -29,37 +29,42 @@ function update_script() {
     exit
   fi
 
-  if check_for_gl_release "Crafty-Controller" "crafty-controller/crafty-4"; then
+  RELEASE=$(curl -fsSL "https://gitlab.com/api/v4/projects/20430749/releases" | grep -o '"tag_name":"v[^"]*"' | head -n 1 | sed 's/"tag_name":"v//;s/"//')
+  if [[ ! -f /opt/crafty-controller_version.txt ]] || [[ ${RELEASE} != "$(cat /opt/crafty-controller_version.txt)" ]]; then
+
     msg_info "Stopping Crafty-Controller"
     systemctl stop crafty-controller
     msg_ok "Stopped Crafty-Controller"
 
-    create_backup \
-      "/opt/crafty-controller/crafty/crafty-4/app/config/db" \
-      "/opt/crafty-controller/crafty/crafty-4/app/config/config.json" \
-      "/opt/crafty-controller/crafty/crafty-4/app/config/web" \
-      "/opt/crafty-controller/crafty/crafty-4/servers" \
-      "/opt/crafty-controller/crafty/crafty-4/backups" \
-      "/opt/crafty-controller/crafty/crafty-4/import"
+    create_backup /opt/crafty-controller/crafty/crafty-4/app/config/version.json \
+      /opt/crafty-controller/crafty/crafty-4/app/config/credits.json \
+      /opt/crafty-controller/crafty/crafty-4/app/config/logging.json \
+      /opt/crafty-controller/crafty/crafty-4/app/config/default.json.example \
+      /opt/crafty-controller/crafty/crafty-4/app/config/motd_format.json
 
-    CLEAN_INSTALL=1 fetch_and_deploy_gl_release "Crafty-Controller" "crafty-controller/crafty-4" "tarball" "latest" "/opt/crafty-controller/crafty/crafty-4"
+    msg_info "Updating Crafty-Controller to v${RELEASE}"
+    curl -fsSL "https://gitlab.com/crafty-controller/crafty-4/-/archive/v${RELEASE}/crafty-4-v${RELEASE}.zip" -o $(basename "https://gitlab.com/crafty-controller/crafty-4/-/archive/v${RELEASE}/crafty-4-v${RELEASE}.zip")
+    $STD unzip crafty-4-v"${RELEASE}".zip
+    cp -a crafty-4-v"${RELEASE}"/. /opt/crafty-controller/crafty/crafty-4/
+    rm -rf crafty-4-v"${RELEASE}"
+    cd /opt/crafty-controller/crafty/crafty-4
+    sudo -u crafty bash -c '
+        source /opt/crafty-controller/crafty/.venv/bin/activate
+        pip3 install --no-cache-dir -r requirements.txt
+      ' &>/dev/null
+    echo "${RELEASE}" >"/opt/crafty-controller_version.txt"
+    msg_ok "Updated Crafty-Controller to v${RELEASE}"
 
     restore_backup
-
-    msg_info "Updating Python dependencies"
-    chown -R crafty:crafty /opt/crafty-controller
-    cd /opt/crafty-controller/crafty/crafty-4
-    $STD sudo -u crafty bash -c '
-      source /opt/crafty-controller/crafty/.venv/bin/activate
-      pip3 install --no-cache-dir -r requirements.txt
-    '
-    msg_ok "Updated Python dependencies"
+    chown -R crafty:crafty /opt/crafty-controller/
 
     msg_info "Starting Crafty-Controller"
     systemctl start crafty-controller
     msg_ok "Started Crafty-Controller"
 
     msg_ok "Updated successfully!"
+  else
+    msg_ok "No update required. ${APP} is already at v${RELEASE}"
   fi
   exit
 }

ct/paperless-ngx.sh

@@ -49,8 +49,7 @@ function update_script() {
     fi
   fi
 
-  RELEASE="v2.20.15"
-  if check_for_gh_release "paperless" "paperless-ngx/paperless-ngx" "${RELEASE}" "v3 needs further testing"; then
+  if check_for_gh_release "paperless" "paperless-ngx/paperless-ngx"; then
     msg_info "Stopping all Paperless-ngx Services"
     systemctl stop paperless-consumer paperless-webserver paperless-scheduler paperless-task-queue
     msg_ok "Stopped all Paperless-ngx Services"
@@ -64,7 +63,7 @@ function update_script() {
       msg_ok "Backup completed to $BACKUP_DIR"
 
       PYTHON_VERSION="3.13" setup_uv
-      CLEAN_INSTALL=1 fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "${RELEASE}" "/opt/paperless" "paperless*tar.xz"
+      CLEAN_INSTALL=1 fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "latest" "/opt/paperless" "paperless*tar.xz"
       CLEAN_INSTALL=1 fetch_and_deploy_gh_release "jbig2enc" "ie13/jbig2enc" "tarball" "latest" "/opt/jbig2enc"
 
       . /etc/os-release
@@ -139,7 +138,7 @@ function update_script() {
       msg_ok "Backup completed to $BACKUP_DIR"
 
       PYTHON_VERSION="3.13" setup_uv
-      CLEAN_INSTALL=1 fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "${RELEASE}" "/opt/paperless" "paperless*tar.xz"
+      CLEAN_INSTALL=1 fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "latest" "/opt/paperless" "paperless*tar.xz"
       CLEAN_INSTALL=1 fetch_and_deploy_gh_release "jbig2enc" "ie13/jbig2enc" "tarball" "latest" "/opt/jbig2enc"
 
       . /etc/os-release

ct/trek.sh

@@ -32,81 +32,48 @@ function update_script() {
 
   NODE_VERSION="24" setup_nodejs
 
-  if check_for_gh_release "trek" "mauriceboe/TREK"; then
-    MIGRATION=0
-    grep -qF "ExecStart=/usr/bin/node --import tsx src/index.ts" \
-      /etc/systemd/system/trek.service && MIGRATION=1
-
+  if check_for_gh_release "trek" "mauriceboe/TREK" "v3.0.22"; then
     msg_info "Stopping Service"
     systemctl stop trek
     msg_ok "Stopped Service"
 
-    ensure_dependencies "libkitinerary-bin"
-
-    create_backup /opt/trek/server/.env \
-      /opt/trek/data \
-      /opt/trek/uploads
+    msg_info "Backing up Data"
+    cp /opt/trek/server/.env /opt/trek.env.bak
+    mv /opt/trek/data /opt/trek-data.bak
+    mv /opt/trek/uploads /opt/trek-uploads.bak
+    msg_ok "Backed up Data"
 
     CLEAN_INSTALL=1 fetch_and_deploy_gh_release "trek" "mauriceboe/TREK" "tarball"
 
-    msg_info "Building TREK"
-    cd /opt/trek
+    msg_info "Building Client"
+    cd /opt/trek/client
     $STD npm ci
-    $STD npm run build --workspace=shared
-    $STD npm run build --workspace=client
-    $STD npm run build --workspace=server
-    msg_ok "Built TREK"
+    $STD npm run build
+    mkdir -p /opt/trek/server/public
+    cp -r /opt/trek/client/dist/* /opt/trek/server/public/
+    cp -r /opt/trek/client/public/fonts /opt/trek/server/public/fonts 2>/dev/null || true
+    msg_ok "Built Client"
 
-    msg_info "Setting up TREK Workspace"
-    rm -rf /opt/trek/server/public
-    mkdir -p /opt/trek/server/public/fonts
-    cp -a /opt/trek/client/dist/. /opt/trek/server/public/
-    cp -a /opt/trek/client/public/fonts/. /opt/trek/server/public/fonts/
-
-    restore_backup
+    msg_info "Installing Server Dependencies"
+    cd /opt/trek/server
+    $STD npm ci
+    msg_ok "Installed Server Dependencies"
 
+    msg_info "Restoring Data"
+    mv /opt/trek-data.bak /opt/trek/data
+    mv /opt/trek-uploads.bak /opt/trek/uploads
     rm -rf /opt/trek/server/data /opt/trek/server/uploads
     ln -s /opt/trek/data /opt/trek/server/data
     ln -s /opt/trek/uploads /opt/trek/server/uploads
-
-    rm -rf /opt/trek/node_modules
-    cd /opt/trek
-    $STD npm ci --workspace=server --omit=dev
-    msg_ok "Set up TREK Workspace"
-
-    if [[ "$MIGRATION" == "1" ]]; then
-      msg_info "Migrating TREK Service"
-      cat <<EOF >/etc/systemd/system/trek.service
-[Unit]
-Description=TREK Travel Planner
-Documentation=https://github.com/mauriceboe/TREK
-After=network-online.target
-Wants=network-online.target
-
-[Service]
-Type=simple
-User=root
-WorkingDirectory=/opt/trek/server
-EnvironmentFile=/opt/trek/server/.env
-Environment=XDG_CACHE_HOME=/tmp/trek-kf6-cache
-Environment=QT_QPA_PLATFORM=offscreen
-ExecStart=/usr/bin/node --require tsconfig-paths/register dist/index.js
-Restart=on-failure
-RestartSec=5
-
-[Install]
-WantedBy=multi-user.target
-EOF
-      systemctl daemon-reload
-      msg_ok "Migrated TREK Service"
-    fi
+    cp /opt/trek.env.bak /opt/trek/server/.env
+    rm -f /opt/trek.env.bak
+    msg_ok "Restored Data"
 
     msg_info "Starting Service"
     systemctl start trek
     msg_ok "Started Service"
     msg_ok "Updated Successfully!"
   fi
-
   exit
 }
 

ct/unifi-os-server.sh

@@ -16,6 +16,7 @@ var_arm64="${var_arm64:-no}"
 var_unprivileged="${var_unprivileged:-0}"
 var_tun="${var_tun:-yes}"
 var_nesting="${var_nesting:-1}"
+var_ns="${var_ns:-1.1.1.1 8.8.8.8}"
 
 header_info "$APP"
 variables
@@ -36,6 +37,19 @@ function update_script() {
 
 start
 build_container
+
+HOOKSCRIPT_PATH="/var/lib/vz/snippets/unifi-os-server-multicast-${CTID}.sh"
+cat >"$HOOKSCRIPT_PATH" <<EOF
+#!/bin/sh
+# Hookscript: enable multicast on the veth interface for UniFi OS Server LXC ${CTID}
+# Required so the UniFi discovery client does not crash on startup inside the container.
+if [ "\$1" = "${CTID}" ] && [ "\$2" = "post-start" ]; then
+  ip link set "veth${CTID}i0" multicast on 2>/dev/null || true
+fi
+EOF
+chmod +x "$HOOKSCRIPT_PATH"
+pct set "$CTID" --hookscript "local:snippets/unifi-os-server-multicast-${CTID}.sh"
+
 description
 
 msg_ok "Completed successfully!\n"

install/crafty-controller-install.sh

@@ -16,22 +16,29 @@ update_os
 msg_info "Setting up TemurinJDK"
 setup_java
 $STD apt install -y temurin-{8,11,17,21,25}-jre
-$STD update-alternatives --set java /usr/lib/jvm/temurin-25-jre-amd64/bin/java
+sudo update-alternatives --set java /usr/lib/jvm/temurin-25-jre-amd64/bin/java
 msg_ok "Installed TemurinJDK"
 
 msg_info "Setup Python3"
 $STD apt install -y \
+  python3 \
   python3-dev \
   python3-pip \
   python3-venv
 rm -rf /usr/lib/python3.*/EXTERNALLY-MANAGED
 msg_ok "Setup Python3"
 
+msg_info "Installing Crafty-Controller (Patience)"
 useradd crafty -m -s /bin/bash
+cd /opt
 mkdir -p /opt/crafty-controller/crafty /opt/crafty-controller/server
-fetch_and_deploy_gl_release "Crafty-Controller" "crafty-controller/crafty-4" "tarball" "latest" "/opt/crafty-controller/crafty/crafty-4"
+RELEASE=$(curl -fsSL "https://gitlab.com/api/v4/projects/20430749/releases" | grep -o '"tag_name":"v[^"]*"' | head -n 1 | sed 's/"tag_name":"v//;s/"//')
+echo "${RELEASE}" >"/opt/crafty-controller_version.txt"
+curl -fsSL "https://gitlab.com/crafty-controller/crafty-4/-/archive/v${RELEASE}/crafty-4-v${RELEASE}.zip" -o "crafty-4-v${RELEASE}.zip"
+$STD unzip crafty-4-v"${RELEASE}".zip
+cp -a crafty-4-v"${RELEASE}"/. /opt/crafty-controller/crafty/crafty-4/
+rm -rf crafty-4-v"${RELEASE}"
 
-msg_info "Installing Crafty-Controller dependencies (Patience)"
 cd /opt/crafty-controller/crafty
 python3 -m venv .venv
 chown -R crafty:crafty /opt/crafty-controller/
@@ -40,7 +47,7 @@ $STD sudo -u crafty bash -c '
     cd /opt/crafty-controller/crafty/crafty-4
     pip3 install --no-cache-dir -r requirements.txt
 '
-msg_ok "Installed Crafty-Controller dependencies"
+msg_ok "Installed Craft-Controller and dependencies"
 
 msg_info "Setting up service"
 cat <<EOF >/etc/systemd/system/crafty-controller.service
@@ -73,6 +80,7 @@ if [[ -f "$CREDS_FILE" ]]; then
   } >>~/crafty-controller.creds
 fi
 msg_ok "Service started"
+
 motd_ssh
 customize
 cleanup_lxc

install/paperless-ngx-install.sh

@@ -46,7 +46,7 @@ msg_ok "Installed Dependencies"
 PG_VERSION="16" setup_postgresql
 PG_DB_NAME="paperlessdb" PG_DB_USER="paperless" setup_postgresql_db
 PYTHON_VERSION="3.13" setup_uv
-fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "v2.20.15" "/opt/paperless" "paperless*tar.xz"
+fetch_and_deploy_gh_release "paperless" "paperless-ngx/paperless-ngx" "prebuild" "latest" "/opt/paperless" "paperless*tar.xz"
 
 msg_info "Setup Paperless-ngx"
 cd /opt/paperless

install/trek-install.sh

@@ -14,82 +14,57 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt install -y \
-  build-essential \
-  libkitinerary-bin
+$STD apt install -y build-essential
 msg_ok "Installed Dependencies"
 
 NODE_VERSION="24" setup_nodejs
-fetch_and_deploy_gh_release "trek" "mauriceboe/TREK" "tarball"
+fetch_and_deploy_gh_release "trek" "mauriceboe/TREK" "tarball" "v3.0.22"
 
-msg_info "Setup TREK"
-cd /opt/trek
+msg_info "Building Client"
+cd /opt/trek/client
 $STD npm ci
-$STD npm run build --workspace=shared
-$STD npm run build --workspace=client
-$STD npm run build --workspace=server
-msg_ok "Setup TREK"
+$STD npm run build
+msg_ok "Built Client"
 
-msg_info "Setting up TREK Workspace"
-rm -rf /opt/trek/server/public
+msg_info "Setting up Server"
+cd /opt/trek/server
+$STD npm ci
 mkdir -p /opt/trek/server/public
-cp -a /opt/trek/client/dist/. /opt/trek/server/public/
-if [[ -d /opt/trek/client/public/fonts ]]; then
-  mkdir -p /opt/trek/server/public/fonts
-  cp -a /opt/trek/client/public/fonts/. /opt/trek/server/public/fonts/
-fi
-mkdir -p \
-  /opt/trek/data/logs \
-  /opt/trek/uploads/files \
-  /opt/trek/uploads/covers \
-  /opt/trek/uploads/avatars \
-  /opt/trek/uploads/photos
-rm -rf /opt/trek/server/data
-rm -rf /opt/trek/server/uploads
+cp -r /opt/trek/client/dist/* /opt/trek/server/public/
+cp -r /opt/trek/client/public/fonts /opt/trek/server/public/fonts 2>/dev/null || true
+mkdir -p /opt/trek/{data/logs,uploads/{files,covers,avatars,photos}}
+rm -rf /opt/trek/server/data /opt/trek/server/uploads
 ln -s /opt/trek/data /opt/trek/server/data
 ln -s /opt/trek/uploads /opt/trek/server/uploads
-cd /opt/trek
-$STD npm prune --omit=dev
-msg_ok "Set up TREK Workspace"
-
-msg_info "Configuring TREK"
 ENCRYPTION_KEY=$(openssl rand -hex 32)
 ADMIN_EMAIL="admin@trek.local"
 ADMIN_PASSWORD=$(openssl rand -base64 18 | tr -dc 'A-Za-z0-9' | head -c 16)
 cat <<EOF >/opt/trek/server/.env
 NODE_ENV=production
-HOST=0.0.0.0
 PORT=3000
 ENCRYPTION_KEY=${ENCRYPTION_KEY}
 ADMIN_EMAIL=${ADMIN_EMAIL}
 ADMIN_PASSWORD=${ADMIN_PASSWORD}
-TZ=UTC
-LOG_LEVEL=info
-DEFAULT_LANGUAGE=en
-ALLOWED_ORIGINS=
 COOKIE_SECURE=false
 FORCE_HTTPS=false
-TRUST_PROXY=1
+LOG_LEVEL=info
+TZ=UTC
 EOF
 chmod 600 /opt/trek/server/.env
-msg_ok "Configured TREK"
+msg_ok "Set up Server"
 
 msg_info "Creating Service"
 cat <<EOF >/etc/systemd/system/trek.service
 [Unit]
 Description=TREK Travel Planner
-Documentation=https://github.com/mauriceboe/TREK
-After=network-online.target
-Wants=network-online.target
+After=network.target
 
 [Service]
 Type=simple
 User=root
 WorkingDirectory=/opt/trek/server
 EnvironmentFile=/opt/trek/server/.env
-Environment=XDG_CACHE_HOME=/tmp/trek-kf6-cache
-Environment=QT_QPA_PLATFORM=offscreen
-ExecStart=/usr/bin/node --require tsconfig-paths/register dist/index.js
+ExecStart=/usr/bin/node --import tsx src/index.ts
 Restart=on-failure
 RestartSec=5
 

tools/addon/immich-public-proxy.sh

@@ -99,7 +99,7 @@ function update() {
 
     msg_info "Installing dependencies"
     cd "$CONFIG_PATH"
-    $STD npm ci
+    $STD npm install
     msg_ok "Installed dependencies"
 
     msg_info "Building ${APP}"
@@ -151,7 +151,7 @@ function install() {
 
   msg_info "Installing dependencies"
   cd "$CONFIG_PATH"
-  $STD npm ci
+  $STD npm install
   msg_ok "Installed dependencies"
 
   msg_info "Building ${APP}"