Update pterodactyl-panel-install.sh

CHANGELOG.md

@@ -422,7 +422,6 @@ Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit
 
   - #### 🔧 Refactor
 
-    - core/vm's: ensure script state is sent on script exit  [@MickLesk](https://github.com/MickLesk) ([#11991](https://github.com/community-scripts/ProxmoxVE/pull/11991))
     - Vaultwarden: export VW_VERSION as version number [@MickLesk](https://github.com/MickLesk) ([#11966](https://github.com/community-scripts/ProxmoxVE/pull/11966))
     - Zabbix: Improve zabbix-agent service detection [@MickLesk](https://github.com/MickLesk) ([#11968](https://github.com/community-scripts/ProxmoxVE/pull/11968))
 

install/pterodactyl-panel-install.sh

@@ -80,6 +80,7 @@ $STD php artisan p:user:make --no-interaction --admin=1 --email "$ADMIN_EMAIL" -
 echo "* * * * * php /opt/pterodactyl-panel/artisan schedule:run >> /dev/null 2>&1" | crontab -u www-data -
 chown -R www-data:www-data /opt/pterodactyl-panel/*
 chmod -R 755 /opt/pterodactyl-panel/storage/* /opt/pterodactyl-panel/bootstrap/cache/
+ln -s /opt/pterodactyl-panel /var/www/pterodactyl
 {
   echo ""
   echo "pterodactyl Admin Username: admin"

misc/api.func

@@ -25,8 +25,40 @@
 #   - Only anonymous statistics (no personal data)
 #   - User can opt-out via DIAGNOSTICS=no
 #   - Random UUID for session tracking only
-  10) echo "Docker / privileged mode required (unsupported environment)" ;;
+#   - Data retention: 30 days
+#
+# ==============================================================================
 
+# ==============================================================================
+# Telemetry Configuration
+# ==============================================================================
+TELEMETRY_URL="https://telemetry.community-scripts.org/telemetry"
+
+# Timeout for telemetry requests (seconds)
+TELEMETRY_TIMEOUT=5
+
+# ==============================================================================
+# SECTION 0: REPOSITORY SOURCE DETECTION
+# ==============================================================================
+
+# ------------------------------------------------------------------------------
+# detect_repo_source()
+#
+# - Dynamically detects which GitHub/Gitea repo the scripts were loaded from
+# - Inspects /proc/$$/cmdline and $0 to find the source URL
+# - Maps detected repo to one of three canonical values:
+#   * "ProxmoxVE"  — official community-scripts/ProxmoxVE (production)
+#   * "ProxmoxVED" — official community-scripts/ProxmoxVED (development)
+#   * "external"   — any fork or unknown source
+# - Fallback: "ProxmoxVED" (CI sed transforms ProxmoxVED → ProxmoxVE on promotion)
+# - Sets and exports REPO_SOURCE global variable
+# - Skips detection if REPO_SOURCE is already set (e.g., by environment)
+# ------------------------------------------------------------------------------
+detect_repo_source() {
+  # Allow explicit override via environment
+  [[ -n "${REPO_SOURCE:-}" ]] && return 0
+
+  local content="" owner_repo=""
 
   # Method 1: Read from /proc/$$/cmdline
   # When invoked via: bash -c "$(curl -fsSL https://.../ct/app.sh)"
@@ -85,17 +117,16 @@ detect_repo_source
 # - Canonical source of truth for ALL exit code mappings
 # - Used by both api.func (telemetry) and error_handler.func (error display)
 # - Supports:
-#   * Generic/Shell errors (1-3, 10, 124-132, 134, 137, 139, 141, 143-146)
-#   * curl/wget errors (4-8, 16, 18, 22-28, 30, 32-36, 39, 44-48, 51-52, 55-57, 59, 61, 63, 75, 78-79, 92, 95)
+#   * Generic/Shell errors (1, 2, 124, 126-130, 134, 137, 139, 141, 143)
+#   * curl/wget errors (6, 7, 22, 28, 35)
 #   * Package manager errors (APT, DPKG: 100-102, 255)
-#   * BSD sysexits (64-78)
 #   * Systemd/Service errors (150-154)
 #   * Python/pip/uv errors (160-162)
 #   * PostgreSQL errors (170-173)
 #   * MySQL/MariaDB errors (180-183)
 #   * MongoDB errors (190-193)
 #   * Proxmox custom codes (200-231)
-#   * Node.js/npm errors (239, 243, 245-249)
+#   * Node.js/npm errors (243, 245-249)
 # - Returns description string for given exit code
 # ------------------------------------------------------------------------------
 explain_exit_code() {
@@ -104,87 +135,30 @@ explain_exit_code() {
   # --- Generic / Shell ---
   1) echo "General error / Operation not permitted" ;;
   2) echo "Misuse of shell builtins (e.g. syntax error)" ;;
-  3) echo "General syntax or argument error" ;;
-  10) echo "Docker / privileged mode required (unsupported environment)" ;;
 
   # --- curl / wget errors (commonly seen in downloads) ---
-  4) echo "curl: Feature not supported or protocol error" ;;
-  5) echo "curl: Could not resolve proxy" ;;
   6) echo "curl: DNS resolution failed (could not resolve host)" ;;
   7) echo "curl: Failed to connect (network unreachable / host down)" ;;
-  8) echo "curl: Server reply error (FTP/SFTP or apk untrusted key)" ;;
-  16) echo "curl: HTTP/2 framing layer error" ;;
-  18) echo "curl: Partial file (transfer not completed)" ;;
   22) echo "curl: HTTP error returned (404, 429, 500+)" ;;
-  23) echo "curl: Write error (disk full or permissions)" ;;
-  24) echo "curl: Write to local file failed" ;;
-  25) echo "curl: Upload failed" ;;
-  26) echo "curl: Read error on local file (I/O)" ;;
-  27) echo "curl: Out of memory (memory allocation failed)" ;;
   28) echo "curl: Operation timeout (network slow or server not responding)" ;;
-  30) echo "curl: FTP port command failed" ;;
-  32) echo "curl: FTP SIZE command failed" ;;
-  33) echo "curl: HTTP range error" ;;
-  34) echo "curl: HTTP post error" ;;
   35) echo "curl: SSL/TLS handshake failed (certificate error)" ;;
-  36) echo "curl: FTP bad download resume" ;;
-  39) echo "curl: LDAP search failed" ;;
-  44) echo "curl: Internal error (bad function call order)" ;;
-  45) echo "curl: Interface error (failed to bind to specified interface)" ;;
-  46) echo "curl: Bad password entered" ;;
-  47) echo "curl: Too many redirects" ;;
-  48) echo "curl: Unknown command line option specified" ;;
-  51) echo "curl: SSL peer certificate or SSH host key verification failed" ;;
-  52) echo "curl: Empty reply from server (got nothing)" ;;
-  55) echo "curl: Failed sending network data" ;;
-  56) echo "curl: Receive error (connection reset by peer)" ;;
-  57) echo "curl: Unrecoverable poll/select error (system I/O failure)" ;;
-  59) echo "curl: Couldn't use specified SSL cipher" ;;
-  61) echo "curl: Bad/unrecognized transfer encoding" ;;
-  63) echo "curl: Maximum file size exceeded" ;;
-  75) echo "Temporary failure (retry later)" ;;
-  78) echo "curl: Remote file not found (404 on FTP/file)" ;;
-  79) echo "curl: SSH session error (key exchange/auth failed)" ;;
-  92) echo "curl: HTTP/2 stream error (protocol violation)" ;;
-  95) echo "curl: HTTP/3 layer error" ;;
 
   # --- Package manager / APT / DPKG ---
   100) echo "APT: Package manager error (broken packages / dependency problems)" ;;
   101) echo "APT: Configuration error (bad sources.list, malformed config)" ;;
   102) echo "APT: Lock held by another process (dpkg/apt still running)" ;;
 
-  # --- BSD sysexits.h (64-78) ---
-  64) echo "Usage error (wrong arguments)" ;;
-  65) echo "Data format error (bad input data)" ;;
-  66) echo "Input file not found (cannot open input)" ;;
-  67) echo "User not found (addressee unknown)" ;;
-  68) echo "Host not found (hostname unknown)" ;;
-  69) echo "Service unavailable" ;;
-  70) echo "Internal software error" ;;
-  71) echo "System error (OS-level failure)" ;;
-  72) echo "Critical OS file missing" ;;
-  73) echo "Cannot create output file" ;;
-  74) echo "I/O error" ;;
-  76) echo "Remote protocol error" ;;
-  77) echo "Permission denied" ;;
-
   # --- Common shell/system errors ---
   124) echo "Command timed out (timeout command)" ;;
-  125) echo "Command failed to start (Docker daemon or execution error)" ;;
   126) echo "Command invoked cannot execute (permission problem?)" ;;
   127) echo "Command not found" ;;
   128) echo "Invalid argument to exit" ;;
-  129) echo "Killed by SIGHUP (terminal closed / hangup)" ;;
   130) echo "Aborted by user (SIGINT)" ;;
-  131) echo "Killed by SIGQUIT (core dumped)" ;;
-  132) echo "Killed by SIGILL (illegal CPU instruction)" ;;
   134) echo "Process aborted (SIGABRT - possibly Node.js heap overflow)" ;;
   137) echo "Killed (SIGKILL / Out of memory?)" ;;
   139) echo "Segmentation fault (core dumped)" ;;
   141) echo "Broken pipe (SIGPIPE - output closed prematurely)" ;;
   143) echo "Terminated (SIGTERM)" ;;
-  144) echo "Killed by signal 16 (SIGUSR1 / SIGSTKFLT)" ;;
-  146) echo "Killed by signal 18 (SIGTSTP)" ;;
 
   # --- Systemd / Service errors (150-154) ---
   150) echo "Systemd: Service failed to start" ;;
@@ -192,6 +166,7 @@ explain_exit_code() {
   152) echo "Permission denied (EACCES)" ;;
   153) echo "Build/compile failed (make/gcc/cmake)" ;;
   154) echo "Node.js: Native addon build failed (node-gyp)" ;;
+
   # --- Python / pip / uv (160-162) ---
   160) echo "Python: Virtualenv / uv environment missing or broken" ;;
   161) echo "Python: Dependency resolution failed" ;;
@@ -242,8 +217,7 @@ explain_exit_code() {
   225) echo "Proxmox: No template available for OS/Version" ;;
   231) echo "Proxmox: LXC stack upgrade failed" ;;
 
-  # --- Node.js / npm / pnpm / yarn (239-249) ---
-  239) echo "npm/Node.js: Unexpected runtime error or dependency failure" ;;
+  # --- Node.js / npm / pnpm / yarn (243-249) ---
   243) echo "Node.js: Out of memory (JavaScript heap out of memory)" ;;
   245) echo "Node.js: Invalid command-line option" ;;
   246) echo "Node.js: Internal JavaScript Parse Error" ;;
@@ -650,8 +624,6 @@ EOF
   curl -fsS -m "${TELEMETRY_TIMEOUT}" -X POST "${TELEMETRY_URL}" \
     -H "Content-Type: application/json" \
     -d "$JSON_PAYLOAD" &>/dev/null || true
-
-  POST_TO_API_DONE=true
 }
 
 # ------------------------------------------------------------------------------

misc/build.func

@@ -297,7 +297,7 @@ validate_container_id() {
   # Falls back gracefully if pvesh unavailable or returns empty
   if command -v pvesh &>/dev/null; then
     local cluster_ids
-    cluster_ids=$(pvesh get /cluster/resources --type vm --output-format json 2>/dev/null |
+    cluster_ids=$(pvesh get /cluster/resources --type vm --output-format json 2>/dev/null | 
       grep -oP '"vmid":\s*\K[0-9]+' 2>/dev/null || true)
     if [[ -n "$cluster_ids" ]] && echo "$cluster_ids" | grep -qw "$ctid"; then
       return 1
@@ -4038,13 +4038,6 @@ EOF'
 
   msg_ok "Customized LXC Container"
 
-  # Optional DNS override for retry scenarios (inside LXC, never on host)
-  if [[ "${DNS_RETRY_OVERRIDE:-false}" == "true" ]]; then
-    msg_info "Applying DNS retry override in LXC (8.8.8.8, 1.1.1.1)"
-    pct exec "$CTID" -- bash -c "printf 'nameserver 8.8.8.8\nnameserver 1.1.1.1\n' >/etc/resolv.conf" >/dev/null 2>&1 || true
-    msg_ok "DNS override applied in LXC"
-  fi
-
   # Install SSH keys
   install_ssh_keys_into_ct
 
@@ -4157,302 +4150,32 @@ EOF'
 
     # Prompt user for cleanup with 60s timeout
     echo ""
-
-    # Detect error type for smart recovery options
-    local is_oom=false
-    local is_network_issue=false
-    local is_apt_issue=false
-    local is_cmd_not_found=false
-    local error_explanation=""
-    if declare -f explain_exit_code >/dev/null 2>&1; then
-      error_explanation="$(explain_exit_code "$install_exit_code")"
-    fi
-
-    # OOM detection: exit codes 134 (SIGABRT/heap), 137 (SIGKILL/OOM), 243 (Node.js heap)
-    if [[ $install_exit_code -eq 134 || $install_exit_code -eq 137 || $install_exit_code -eq 243 ]]; then
-      is_oom=true
-    fi
-
-    # APT/DPKG detection: exit codes 100-102 (APT), 255 (DPKG with log evidence)
-    case "$install_exit_code" in
-    100 | 101 | 102) is_apt_issue=true ;;
-    255)
-      if [[ -f "$combined_log" ]] && grep -qiE 'dpkg|apt-get|apt\.conf|broken packages|unmet dependencies|E: Sub-process|E: Failed' "$combined_log"; then
-        is_apt_issue=true
-      fi
-      ;;
-    esac
-
-    # Command not found detection
-    if [[ $install_exit_code -eq 127 ]]; then
-      is_cmd_not_found=true
-    fi
-
-    # Network-related detection (curl/apt/git fetch failures and transient network issues)
-    case "$install_exit_code" in
-    6 | 7 | 22 | 28 | 35 | 52 | 56 | 57 | 75 | 78) is_network_issue=true ;;
-    100)
-      # APT can fail due to network (Failed to fetch)
-      if [[ -f "$combined_log" ]] && grep -qiE 'Failed to fetch|Could not resolve|Connection failed|Network is unreachable|Temporary failure resolving' "$combined_log"; then
-        is_network_issue=true
-      fi
-      ;;
-    128)
-      if [[ -f "$combined_log" ]] && grep -qiE 'RPC failed|early EOF|fetch-pack|HTTP/2 stream|Could not resolve host|Temporary failure resolving|Failed to fetch|Connection reset|Network is unreachable' "$combined_log"; then
-        is_network_issue=true
-      fi
-      ;;
-    esac
-
-    # Exit 1 subclassification: analyze logs to identify actual root cause
-    # Many exit 1 errors are actually APT, OOM, network, or command-not-found issues
-    if [[ $install_exit_code -eq 1 && -f "$combined_log" ]]; then
-      if grep -qiE 'E: Unable to|E: Package|E: Failed to fetch|dpkg.*error|broken packages|unmet dependencies|dpkg --configure -a' "$combined_log"; then
-        is_apt_issue=true
-      fi
-      if grep -qiE 'Cannot allocate memory|Out of memory|oom-killer|Killed process|JavaScript heap' "$combined_log"; then
-        is_oom=true
-      fi
-      if grep -qiE 'Could not resolve|DNS|Connection refused|Network is unreachable|No route to host|Temporary failure resolving|Failed to fetch' "$combined_log"; then
-        is_network_issue=true
-      fi
-      if grep -qiE ': command not found|No such file or directory.*/s?bin/' "$combined_log"; then
-        is_cmd_not_found=true
-      fi
-    fi
-
-    # Show error explanation if available
-    if [[ -n "$error_explanation" ]]; then
-      echo -e "${TAB}${RD}Error: ${error_explanation}${CL}"
-      echo ""
-    fi
-
-    # Show specific hints for known error types
-    if [[ $install_exit_code -eq 10 ]]; then
-      echo -e "${TAB}${INFO} This error usually means the container needs ${GN}privileged${CL} mode or Docker/nesting support."
-      echo -e "${TAB}${INFO} Recreate with: Advanced Install → Container Type: ${GN}Privileged${CL}"
-      echo ""
-    fi
-
-    if [[ $install_exit_code -eq 125 || $install_exit_code -eq 126 ]]; then
-      echo -e "${TAB}${INFO} The command exists but cannot be executed. This may be a ${GN}permission${CL} issue."
-      echo -e "${TAB}${INFO} If using Docker, ensure the container is ${GN}privileged${CL} or has correct permissions."
-      echo ""
-    fi
-
-    if [[ "$is_cmd_not_found" == true ]]; then
-      local missing_cmd=""
-      if [[ -f "$combined_log" ]]; then
-        missing_cmd=$(grep -oiE '[a-zA-Z0-9_.-]+: command not found' "$combined_log" | tail -1 | sed 's/: command not found//')
-      fi
-      if [[ -n "$missing_cmd" ]]; then
-        echo -e "${TAB}${INFO} Missing command: ${GN}${missing_cmd}${CL}"
-      fi
-      echo ""
-    fi
-
-    # Build recovery menu based on error type
-    echo -e "${YW}What would you like to do?${CL}"
-    echo ""
-    echo -e "  ${GN}1)${CL} Remove container and exit"
-    echo -e "  ${GN}2)${CL} Keep container for debugging"
-    echo -e "  ${GN}3)${CL} Retry with verbose mode (full rebuild)"
-
-    local next_option=4
-    local APT_OPTION="" OOM_OPTION="" DNS_OPTION=""
-
-    if [[ "$is_apt_issue" == true ]]; then
-      echo -e "  ${GN}${next_option})${CL} Repair APT/DPKG state and re-run install (in-place)"
-      APT_OPTION=$next_option
-      next_option=$((next_option + 1))
-    fi
-
-    if [[ "$is_oom" == true ]]; then
-      local new_ram=$((RAM_SIZE * 2))
-      local new_cpu=$((CORE_COUNT * 2))
-      echo -e "  ${GN}${next_option})${CL} Retry with more resources (RAM: ${RAM_SIZE}→${new_ram} MiB, CPU: ${CORE_COUNT}→${new_cpu} cores)"
-      OOM_OPTION=$next_option
-      next_option=$((next_option + 1))
-    fi
-
-    if [[ "$is_network_issue" == true ]]; then
-      echo -e "  ${GN}${next_option})${CL} Retry with DNS override in LXC (8.8.8.8 / 1.1.1.1)"
-      DNS_OPTION=$next_option
-      next_option=$((next_option + 1))
-    fi
-
-    local max_option=$((next_option - 1))
-
-    echo ""
-    echo -en "${YW}Select option [1-${max_option}] (default: 1, auto-remove in 60s): ${CL}"
+    echo -en "${TAB}❓${TAB}${YW}Remove broken container ${CTID}? (Y/n) [auto-remove in 60s]: ${CL}"
 
     if read -t 60 -r response; then
-      case "${response:-1}" in
-      1)
+      if [[ -z "$response" || "$response" =~ ^[Yy]$ ]]; then
         # Remove container
-        echo -e "\n${TAB}${HOLD}${YW}Removing container ${CTID}${CL}"
+        echo ""
+        msg_info "Removing container ${CTID}"
         pct stop "$CTID" &>/dev/null || true
         pct destroy "$CTID" &>/dev/null || true
-        echo -e "${BFR}${CM}${GN}Container ${CTID} removed${CL}"
-        ;;
-      2)
-        echo -e "\n${TAB}${YW}Container ${CTID} kept for debugging${CL}"
+        msg_ok "Container ${CTID} removed"
+      elif [[ "$response" =~ ^[Nn]$ ]]; then
+        echo ""
+        msg_warn "Container ${CTID} kept for debugging"
+
         # Dev mode: Setup MOTD/SSH for debugging access to broken container
         if [[ "${DEV_MODE_MOTD:-false}" == "true" ]]; then
           echo -e "${TAB}${HOLD}${DGN}Setting up MOTD and SSH for debugging...${CL}"
           if pct exec "$CTID" -- bash -c "
-              source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/install.func)
-              declare -f motd_ssh >/dev/null 2>&1 && motd_ssh || true
-            " >/dev/null 2>&1; then
+            source <(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/misc/install.func)
+            declare -f motd_ssh >/dev/null 2>&1 && motd_ssh || true
+          " >/dev/null 2>&1; then
             local ct_ip=$(pct exec "$CTID" ip a s dev eth0 2>/dev/null | awk '/inet / {print $2}' | cut -d/ -f1)
             echo -e "${BFR}${CM}${GN}MOTD/SSH ready - SSH into container: ssh root@${ct_ip}${CL}"
           fi
         fi
-        exit $install_exit_code
-        ;;
-      3)
-        # Retry with verbose mode (full rebuild)
-        echo -e "\n${TAB}${HOLD}${YW}Removing container ${CTID} for rebuild...${CL}"
-        pct stop "$CTID" &>/dev/null || true
-        pct destroy "$CTID" &>/dev/null || true
-        echo -e "${BFR}${CM}${GN}Container ${CTID} removed${CL}"
-        echo ""
-        # Get new container ID
-        local old_ctid="$CTID"
-        export CTID=$(get_valid_container_id "$CTID")
-        export VERBOSE="yes"
-        export var_verbose="yes"
-
-        # Show rebuild summary
-        echo -e "${YW}Rebuilding with preserved settings:${CL}"
-        echo -e "  Container ID: ${old_ctid} → ${CTID}"
-        echo -e "  RAM: ${RAM_SIZE} MiB | CPU: ${CORE_COUNT} cores | Disk: ${DISK_SIZE} GB"
-        echo -e "  Network: ${NET:-dhcp} | Bridge: ${BRG:-vmbr0}"
-        echo -e "  Verbose: ${GN}enabled${CL}"
-        echo ""
-        msg_info "Restarting installation..."
-        # Re-run build_container
-        build_container
-        return $?
-        ;;
-      *)
-        # Handle dynamic smart recovery options via named option variables
-        local handled=false
-
-        if [[ -n "${APT_OPTION}" && "${response}" == "${APT_OPTION}" ]]; then
-          # APT/DPKG in-place repair: fix broken package state and re-run install script
-          handled=true
-          echo -e "\n${TAB}${HOLD}${YW}Repairing APT/DPKG state in container ${CTID}...${CL}"
-          pct exec "$CTID" -- bash -c "
-            DEBIAN_FRONTEND=noninteractive dpkg --configure -a 2>/dev/null || true
-            apt-get -f install -y 2>/dev/null || true
-            apt-get clean 2>/dev/null
-            apt-get update 2>/dev/null || true
-          " >/dev/null 2>&1 || true
-          echo -e "${BFR}${CM}${GN}APT/DPKG state repaired in container ${CTID}${CL}"
-          echo ""
-          export VERBOSE="yes"
-          export var_verbose="yes"
-
-          echo -e "${YW}Re-running installation in existing container ${CTID}:${CL}"
-          echo -e "  RAM: ${RAM_SIZE} MiB | CPU: ${CORE_COUNT} cores | Disk: ${DISK_SIZE} GB"
-          echo -e "  Verbose: ${GN}enabled${CL}"
-          echo ""
-          msg_info "Re-running installation script..."
-
-          # Re-run install script in existing container (don't destroy/recreate)
-          set +Eeuo pipefail
-          trap - ERR
-          lxc-attach -n "$CTID" -- bash -c "$(curl -fsSL https://raw.githubusercontent.com/community-scripts/ProxmoxVE/main/install/${var_install}.sh)"
-          local apt_retry_exit=$?
-          set -Eeuo pipefail
-          trap 'error_handler' ERR
-
-          # Check for error flag from retry
-          local apt_retry_code=0
-          if [[ -n "${SESSION_ID:-}" ]]; then
-            local retry_error_flag="/root/.install-${SESSION_ID}.failed"
-            if pct exec "$CTID" -- test -f "$retry_error_flag" 2>/dev/null; then
-              apt_retry_code=$(pct exec "$CTID" -- cat "$retry_error_flag" 2>/dev/null || echo "1")
-              pct exec "$CTID" -- rm -f "$retry_error_flag" 2>/dev/null || true
-            fi
-          fi
-
-          if [[ $apt_retry_code -eq 0 && $apt_retry_exit -ne 0 ]]; then
-            apt_retry_code=$apt_retry_exit
-          fi
-
-          if [[ $apt_retry_code -eq 0 ]]; then
-            msg_ok "Installation completed successfully after APT repair!"
-            post_update_to_api "done" "0" "force"
-            return 0
-          else
-            msg_error "Installation still failed after APT repair (exit code: ${apt_retry_code})"
-            install_exit_code=$apt_retry_code
-          fi
-        fi
-
-        if [[ -n "${OOM_OPTION}" && "${response}" == "${OOM_OPTION}" ]]; then
-          # Retry with doubled resources
-          handled=true
-          echo -e "\n${TAB}${HOLD}${YW}Removing container ${CTID} for rebuild with more resources...${CL}"
-          pct stop "$CTID" &>/dev/null || true
-          pct destroy "$CTID" &>/dev/null || true
-          echo -e "${BFR}${CM}${GN}Container ${CTID} removed${CL}"
-          echo ""
-          local old_ctid="$CTID"
-          local old_ram="$RAM_SIZE"
-          local old_cpu="$CORE_COUNT"
-          export CTID=$(get_valid_container_id "$CTID")
-          export RAM_SIZE=$((RAM_SIZE * 2))
-          export CORE_COUNT=$((CORE_COUNT * 2))
-          export var_ram="$RAM_SIZE"
-          export var_cpu="$CORE_COUNT"
-          export VERBOSE="yes"
-          export var_verbose="yes"
-
-          echo -e "${YW}Rebuilding with increased resources:${CL}"
-          echo -e "  Container ID: ${old_ctid} → ${CTID}"
-          echo -e "  RAM: ${old_ram} → ${GN}${RAM_SIZE}${CL} MiB (x2)"
-          echo -e "  CPU: ${old_cpu} → ${GN}${CORE_COUNT}${CL} cores (x2)"
-          echo -e "  Disk: ${DISK_SIZE} GB | Network: ${NET:-dhcp} | Bridge: ${BRG:-vmbr0}"
-          echo -e "  Verbose: ${GN}enabled${CL}"
-          echo ""
-          msg_info "Restarting installation..."
-          build_container
-          return $?
-        fi
-
-        if [[ -n "${DNS_OPTION}" && "${response}" == "${DNS_OPTION}" ]]; then
-          # Retry with DNS override in LXC
-          handled=true
-          echo -e "\n${TAB}${HOLD}${YW}Removing container ${CTID} for rebuild with DNS override...${CL}"
-          pct stop "$CTID" &>/dev/null || true
-          pct destroy "$CTID" &>/dev/null || true
-          echo -e "${BFR}${CM}${GN}Container ${CTID} removed${CL}"
-          echo ""
-          local old_ctid="$CTID"
-          export CTID=$(get_valid_container_id "$CTID")
-          export DNS_RETRY_OVERRIDE="true"
-          export VERBOSE="yes"
-          export var_verbose="yes"
-
-          echo -e "${YW}Rebuilding with DNS override in LXC:${CL}"
-          echo -e "  Container ID: ${old_ctid} → ${CTID}"
-          echo -e "  DNS: ${GN}8.8.8.8, 1.1.1.1${CL} (inside LXC only)"
-          echo -e "  Verbose: ${GN}enabled${CL}"
-          echo ""
-          msg_info "Restarting installation..."
-          build_container
-          return $?
-        fi
-
-        if [[ "$handled" == false ]]; then
-          echo -e "\n${TAB}${YW}Invalid option. Container ${CTID} kept.${CL}"
-          exit $install_exit_code
-        fi
-        ;;
-      esac
+      fi
     else
       # Timeout - auto-remove
       echo ""
@@ -5530,20 +5253,14 @@ ensure_log_on_host() {
 # - Exit trap handler for reporting to API telemetry
 # - Captures exit code and reports to PocketBase using centralized error descriptions
 # - Uses explain_exit_code() from api.func for consistent error messages
-# - For non-zero exit codes: posts "failed" status
-# - For zero exit codes where post_update_to_api was never called:
-#   catches orphaned "installing" records (e.g., script exited cleanly
-#   but description() was never reached)
+# - Posts failure status with exit code to API (error description resolved automatically)
+# - Only executes on non-zero exit codes
 # ------------------------------------------------------------------------------
 api_exit_script() {
-  local exit_code=$?
+  exit_code=$?
   if [ $exit_code -ne 0 ]; then
     ensure_log_on_host
     post_update_to_api "failed" "$exit_code"
-  elif [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    # Script exited with 0 but never sent a completion status
-    # This catches edge cases like early returns after post_to_api()
-    post_update_to_api "failed" "1"
   fi
 }
 
@@ -5551,6 +5268,5 @@ if command -v pveversion >/dev/null 2>&1; then
   trap 'api_exit_script' EXIT
 fi
 trap 'ensure_log_on_host; post_update_to_api "failed" "$?"' ERR
-trap 'ensure_log_on_host; post_update_to_api "failed" "129"; exit 129' SIGHUP
 trap 'ensure_log_on_host; post_update_to_api "failed" "130"; exit 130' SIGINT
 trap 'ensure_log_on_host; post_update_to_api "failed" "143"; exit 143' SIGTERM

misc/error_handler.func

@@ -37,34 +37,11 @@ if ! declare -f explain_exit_code &>/dev/null; then
     case "$code" in
     1) echo "General error / Operation not permitted" ;;
     2) echo "Misuse of shell builtins (e.g. syntax error)" ;;
-    10) echo "Docker / privileged mode required (unsupported environment)" ;;
-    4) echo "curl: Feature not supported or protocol error" ;;
-    5) echo "curl: Could not resolve proxy" ;;
     6) echo "curl: DNS resolution failed (could not resolve host)" ;;
     7) echo "curl: Failed to connect (network unreachable / host down)" ;;
-    8) echo "curl: FTP server reply error" ;;
     22) echo "curl: HTTP error returned (404, 429, 500+)" ;;
-    23) echo "curl: Write error (disk full or permissions)" ;;
-    25) echo "curl: Upload failed" ;;
     28) echo "curl: Operation timeout (network slow or server not responding)" ;;
-    30) echo "curl: FTP port command failed" ;;
     35) echo "curl: SSL/TLS handshake failed (certificate error)" ;;
-    56) echo "curl: Receive error (connection reset by peer)" ;;
-    75) echo "Temporary failure (retry later)" ;;
-    78) echo "curl: Remote file not found (404 on FTP/file)" ;;
-    64) echo "Usage error (wrong arguments)" ;;
-    65) echo "Data format error (bad input data)" ;;
-    66) echo "Input file not found (cannot open input)" ;;
-    67) echo "User not found (addressee unknown)" ;;
-    68) echo "Host not found (hostname unknown)" ;;
-    69) echo "Service unavailable" ;;
-    70) echo "Internal software error" ;;
-    71) echo "System error (OS-level failure)" ;;
-    72) echo "Critical OS file missing" ;;
-    73) echo "Cannot create output file" ;;
-    74) echo "I/O error" ;;
-    76) echo "Remote protocol error" ;;
-    77) echo "Permission denied" ;;
     100) echo "APT: Package manager error (broken packages / dependency problems)" ;;
     101) echo "APT: Configuration error (bad sources.list, malformed config)" ;;
     102) echo "APT: Lock held by another process (dpkg/apt still running)" ;;

misc/vm-core.func

@@ -529,21 +529,9 @@ cleanup_vmid() {
 }
 
 cleanup() {
-  local exit_code=$?
   if [[ "$(dirs -p | wc -l)" -gt 1 ]]; then
     popd >/dev/null || true
   fi
-  # Report final telemetry status if post_to_api_vm was called but no update was sent
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if declare -f post_update_to_api >/dev/null 2>&1; then
-      if [[ $exit_code -ne 0 ]]; then
-        post_update_to_api "failed" "$exit_code"
-      else
-        # Exited cleanly but description()/success was never called — shouldn't happen
-        post_update_to_api "failed" "1"
-      fi
-    fi
-  fi
 }
 
 check_root() {

vm/archlinux-vm.sh

@@ -100,15 +100,8 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
+  post_update_to_api "done" "none"
   rm -rf $TEMP_DIR
 }
 

vm/debian-13-vm.sh

@@ -100,15 +100,8 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
+  post_update_to_api "done" "none"
   rm -rf $TEMP_DIR
 }
 

vm/debian-vm.sh

@@ -100,15 +100,8 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
+  post_update_to_api "done" "none"
   rm -rf $TEMP_DIR
 }
 

vm/haos-vm.sh

@@ -104,16 +104,8 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  # Only send telemetry if post_to_api_vm was called (installing status was sent)
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
+  post_update_to_api "done" "none"
   rm -rf $TEMP_DIR
 }
 

vm/mikrotik-routeros.sh

@@ -101,15 +101,8 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
+  post_update_to_api "done" "none"
   rm -rf $TEMP_DIR
 }
 

vm/nextcloud-vm.sh

@@ -100,15 +100,8 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
+  post_update_to_api "done" "none"
   rm -rf $TEMP_DIR
 }
 

vm/openwrt-vm.sh

@@ -105,15 +105,7 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
   rm -rf $TEMP_DIR
 }
 

vm/opnsense-vm.sh

@@ -79,15 +79,8 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
+  post_update_to_api "done" "none"
   rm -rf $TEMP_DIR
 }
 

vm/owncloud-vm.sh

@@ -101,15 +101,8 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
+  post_update_to_api "done" "none"
   rm -rf $TEMP_DIR
 }
 

vm/pimox-haos-vm.sh

@@ -109,15 +109,8 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
+  post_update_to_api "done" "none"
   rm -rf $TEMP_DIR
 }
 

vm/ubuntu2204-vm.sh

@@ -97,15 +97,7 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
   rm -rf $TEMP_DIR
 }
 

vm/ubuntu2404-vm.sh

@@ -100,15 +100,7 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
   rm -rf $TEMP_DIR
 }
 

vm/ubuntu2504-vm.sh

@@ -99,15 +99,7 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
   rm -rf $TEMP_DIR
 }
 

vm/umbrel-os-vm.sh

@@ -99,15 +99,8 @@ function cleanup_vmid() {
 }
 
 function cleanup() {
-  local exit_code=$?
   popd >/dev/null
-  if [[ "${POST_TO_API_DONE:-}" == "true" && "${POST_UPDATE_DONE:-}" != "true" ]]; then
-    if [[ $exit_code -eq 0 ]]; then
-      post_update_to_api "done" "none"
-    else
-      post_update_to_api "failed" "$exit_code"
-    fi
-  fi
+  post_update_to_api "done" "none"
   rm -rf $TEMP_DIR
 }