plex: prevent [] syntax issue

CHANGELOG.md

@@ -10,21 +10,6 @@
 > [!CAUTION]
 Exercise vigilance regarding copycat or coat-tailing sites that seek to exploit the project's popularity for potentially malicious purposes.
 
-## 2025-11-21
-
-### 🚀 Updated Scripts
-
-  - #### 🐞 Bug Fixes
-
-    - plex: prevent [] syntax issue [@MickLesk](https://github.com/MickLesk) ([#9318](https://github.com/community-scripts/ProxmoxVE/pull/9318))
-    - fix: karakeep strip "v" from release version [@CrazyWolf13](https://github.com/CrazyWolf13) ([#9324](https://github.com/community-scripts/ProxmoxVE/pull/9324))
-    - NetVisor: fix grep in update [@vhsdream](https://github.com/vhsdream) ([#9334](https://github.com/community-scripts/ProxmoxVE/pull/9334))
-    - Immich: pin correct version [@vhsdream](https://github.com/vhsdream) ([#9332](https://github.com/community-scripts/ProxmoxVE/pull/9332))
-
-  - #### 🔧 Refactor
-
-    - Refactor IPv6 disable logic and add 'disable' option [@MickLesk](https://github.com/MickLesk) ([#9326](https://github.com/community-scripts/ProxmoxVE/pull/9326))
-
 ## 2025-11-20
 
 ### 🚀 Updated Scripts

ct/karakeep.sh

@@ -82,7 +82,7 @@ function update_script() {
     cd /opt/karakeep/packages/db
     $STD pnpm migrate
     $STD pnpm store prune
-    sed -i "s/^SERVER_VERSION=.*$/SERVER_VERSION=${CHECK_UPDATE_RELEASE#v}/" /etc/karakeep/karakeep.env
+    sed -i "s/^SERVER_VERSION=.*$/SERVER_VERSION=${CHECK_UPDATE_RELEASE}/" /etc/karakeep/karakeep.env
     msg_ok "Updated Karakeep"
 
     msg_info "Starting Services"

ct/netvisor.sh

@@ -51,7 +51,7 @@ function update_script() {
 
     cp /opt/netvisor.env.bak /opt/netvisor/.env
     LOCAL_IP="$(hostname -I | awk '{print $1}')"
-    if ! grep -q "PUBLIC_URL" /opt/netvisor/.env; then
+    if ! grep -q "PUBLIC_URL"; then
       sed -i "\|_PATH=|a\NETVISOR_PUBLIC_URL=http://${LOCAL_IP}:60072" /opt/netvisor/.env
     fi
     sed -i 's|_TARGET=.*$|_URL=http://127.0.0.1:60072|' /opt/netvisor/.env

frontend/public/json/filebrowser.json

@@ -11,7 +11,7 @@
   "privileged": false,
   "interface_port": 8080,
   "documentation": null,
-  "website": "https://filebrowser.org/index.html#features",
+  "website": "https://filebrowser.org/features",
   "logo": "https://cdn.jsdelivr.net/gh/selfhst/icons/webp/file-browser.webp",
   "config_path": "",
   "description": "File Browser offers a user-friendly web interface for managing files within a designated directory. It allows you to perform various actions such as uploading, deleting, previewing, renaming, and editing files.",

frontend/public/json/versions.json

@@ -1,119 +1,4 @@
 [
-  {
-    "name": "rcourtman/Pulse",
-    "version": "v4.32.3",
-    "date": "2025-11-21T11:16:25Z"
-  },
-  {
-    "name": "seriousm4x/UpSnap",
-    "version": "5.2.4",
-    "date": "2025-11-21T10:25:05Z"
-  },
-  {
-    "name": "emqx/emqx",
-    "version": "e6.0.2-beta.2",
-    "date": "2025-11-21T10:20:27Z"
-  },
-  {
-    "name": "sabnzbd/sabnzbd",
-    "version": "4.5.5",
-    "date": "2025-10-24T11:12:22Z"
-  },
-  {
-    "name": "openobserve/openobserve",
-    "version": "v0.16.3",
-    "date": "2025-11-21T08:54:06Z"
-  },
-  {
-    "name": "booklore-app/booklore",
-    "version": "v1.11.0",
-    "date": "2025-11-21T08:09:03Z"
-  },
-  {
-    "name": "mattermost/mattermost",
-    "version": "v10.11.7",
-    "date": "2025-11-17T08:40:53Z"
-  },
-  {
-    "name": "MariaDB/server",
-    "version": "mariadb-12.1.2",
-    "date": "2025-11-18T15:16:21Z"
-  },
-  {
-    "name": "morpheus65535/bazarr",
-    "version": "v1.5.3",
-    "date": "2025-09-20T12:12:33Z"
-  },
-  {
-    "name": "Jackett/Jackett",
-    "version": "v0.24.338",
-    "date": "2025-11-21T05:55:33Z"
-  },
-  {
-    "name": "bluenviron/mediamtx",
-    "version": "v1.15.4",
-    "date": "2025-11-21T01:21:03Z"
-  },
-  {
-    "name": "jeedom/core",
-    "version": "4.4.20",
-    "date": "2025-11-21T00:27:06Z"
-  },
-  {
-    "name": "TasmoAdmin/TasmoAdmin",
-    "version": "v4.3.2",
-    "date": "2025-10-18T12:11:00Z"
-  },
-  {
-    "name": "project-zot/zot",
-    "version": "v2.1.11",
-    "date": "2025-11-20T20:14:44Z"
-  },
-  {
-    "name": "readeck/readeck",
-    "version": "0.21.0",
-    "date": "2025-11-20T18:35:59Z"
-  },
-  {
-    "name": "saltstack/salt",
-    "version": "v3007.9",
-    "date": "2025-11-20T17:58:32Z"
-  },
-  {
-    "name": "keycloak/keycloak",
-    "version": "26.4.5",
-    "date": "2025-11-12T15:24:23Z"
-  },
-  {
-    "name": "msgbyte/tianji",
-    "version": "v1.30.12",
-    "date": "2025-11-20T16:13:19Z"
-  },
-  {
-    "name": "meilisearch/meilisearch",
-    "version": "prototype-v1.26.0.arm-native-docker-build-1",
-    "date": "2025-11-20T15:38:39Z"
-  },
-  {
-    "name": "duplicati/duplicati",
-    "version": "v2.2.0.101-2.2.0.101_canary_2025-11-20",
-    "date": "2025-11-20T14:50:45Z"
-  },
-  {
-    "name": "NodeBB/NodeBB",
-    "version": "v4.6.3",
-    "date": "2025-11-20T14:13:22Z"
-  },
-  {
-    "name": "n8n-io/n8n",
-    "version": "n8n@1.120.4",
-    "date": "2025-11-19T12:57:55Z"
-  },
-  {
-    "name": "SigNoz/signoz",
-    "version": "v0.102.1",
-    "date": "2025-11-20T12:20:18Z"
-  },
   {
     "name": "kimai/kimai",
     "version": "2.44.0",
@@ -129,11 +14,21 @@
     "version": "fumadocs-ui@16.0.15",
     "date": "2025-11-20T10:52:04Z"
   },
+  {
+    "name": "mattermost/mattermost",
+    "version": "v10.11.7",
+    "date": "2025-11-17T08:40:53Z"
+  },
   {
     "name": "Athou/commafeed",
     "version": "5.12.0",
     "date": "2025-11-20T06:18:58Z"
   },
+  {
+    "name": "Jackett/Jackett",
+    "version": "v0.24.336",
+    "date": "2025-11-20T05:55:54Z"
+  },
   {
     "name": "documenso/documenso",
     "version": "v2.0.14",
@@ -154,6 +49,11 @@
     "version": "v1.80.0.dev6",
     "date": "2025-11-20T02:03:21Z"
   },
+  {
+    "name": "jeedom/core",
+    "version": "4.4.20",
+    "date": "2025-11-20T00:27:04Z"
+  },
   {
     "name": "steveiliop56/tinyauth",
     "version": "v4.0.1",
@@ -164,6 +64,11 @@
     "version": "v4.106.2",
     "date": "2025-11-20T00:23:05Z"
   },
+  {
+    "name": "keycloak/keycloak",
+    "version": "26.4.5",
+    "date": "2025-11-12T15:24:23Z"
+  },
   {
     "name": "esphome/esphome",
     "version": "2025.11.0",
@@ -199,6 +104,11 @@
     "version": "0.51.3",
     "date": "2025-11-19T15:45:28Z"
   },
+  {
+    "name": "NodeBB/NodeBB",
+    "version": "v4.6.2",
+    "date": "2025-11-19T15:31:59Z"
+  },
   {
     "name": "BookStackApp/BookStack",
     "version": "v25.11.2",
@@ -229,6 +139,11 @@
     "version": "v0.13.0",
     "date": "2025-11-19T14:16:07Z"
   },
+  {
+    "name": "n8n-io/n8n",
+    "version": "n8n@1.120.4",
+    "date": "2025-11-19T12:57:55Z"
+  },
   {
     "name": "AdguardTeam/AdGuardHome",
     "version": "v0.107.69",
@@ -244,6 +159,16 @@
     "version": "v7.5.0",
     "date": "2025-11-19T08:36:29Z"
   },
+  {
+    "name": "SigNoz/signoz",
+    "version": "v0.102.0",
+    "date": "2025-11-19T06:53:59Z"
+  },
+  {
+    "name": "morpheus65535/bazarr",
+    "version": "v1.5.3",
+    "date": "2025-09-20T12:12:33Z"
+  },
   {
     "name": "element-hq/synapse",
     "version": "v1.143.0rc1",
@@ -284,6 +209,11 @@
     "version": "v3.6.2",
     "date": "2025-11-18T16:25:16Z"
   },
+  {
+    "name": "MariaDB/server",
+    "version": "mariadb-12.1.2",
+    "date": "2025-11-18T15:16:21Z"
+  },
   {
     "name": "redis/redis",
     "version": "8.4.0",
@@ -299,6 +229,11 @@
     "version": "v0.7.5",
     "date": "2025-11-18T10:50:21Z"
   },
+  {
+    "name": "emqx/emqx",
+    "version": "e6.1.0-alpha.1",
+    "date": "2025-11-18T10:33:45Z"
+  },
   {
     "name": "wazuh/wazuh",
     "version": "coverity-w47-4.14.2",
@@ -339,6 +274,11 @@
     "version": "v1.4.5",
     "date": "2025-11-17T15:20:35Z"
   },
+  {
+    "name": "meilisearch/meilisearch",
+    "version": "latest",
+    "date": "2025-11-17T09:29:20Z"
+  },
   {
     "name": "rabbitmq/rabbitmq-server",
     "version": "v4.2.1",
@@ -384,6 +324,11 @@
     "version": "3.3.8",
     "date": "2025-11-16T17:04:37Z"
   },
+  {
+    "name": "msgbyte/tianji",
+    "version": "v1.30.11",
+    "date": "2025-11-16T16:21:04Z"
+  },
   {
     "name": "AlexxIT/go2rtc",
     "version": "v1.9.12",
@@ -459,6 +404,11 @@
     "version": "22.0.3",
     "date": "2025-11-14T14:49:25Z"
   },
+  {
+    "name": "openobserve/openobserve",
+    "version": "v0.16.2",
+    "date": "2025-11-14T12:05:36Z"
+  },
   {
     "name": "zitadel/zitadel",
     "version": "v4.7.0",
@@ -484,6 +434,11 @@
     "version": "v0.86.1",
     "date": "2025-11-14T05:05:44Z"
   },
+  {
+    "name": "rcourtman/Pulse",
+    "version": "v4.31.0",
+    "date": "2025-11-14T00:18:50Z"
+  },
   {
     "name": "gristlabs/grist-core",
     "version": "v1.7.7",
@@ -609,6 +564,11 @@
     "version": "v1.0.0-beta19",
     "date": "2025-11-09T17:26:30Z"
   },
+  {
+    "name": "duplicati/duplicati",
+    "version": "v2.2.0.1_stable_2025-11-09",
+    "date": "2025-11-09T17:21:54Z"
+  },
   {
     "name": "Cleanuparr/Cleanuparr",
     "version": "v2.4.5",
@@ -874,6 +834,11 @@
     "version": "cassandra-5.0.6",
     "date": "2025-10-29T07:40:47Z"
   },
+  {
+    "name": "booklore-app/booklore",
+    "version": "v1.10.0",
+    "date": "2025-10-28T19:04:35Z"
+  },
   {
     "name": "pi-hole/pi-hole",
     "version": "v6.2.2",
@@ -909,6 +874,11 @@
     "version": "v0.25.2",
     "date": "2025-10-24T12:30:04Z"
   },
+  {
+    "name": "sabnzbd/sabnzbd",
+    "version": "4.5.5",
+    "date": "2025-10-24T11:12:22Z"
+  },
   {
     "name": "crowdsecurity/crowdsec",
     "version": "v1.7.3",
@@ -934,6 +904,11 @@
     "version": "release-1.24.1",
     "date": "2025-10-22T10:28:00Z"
   },
+  {
+    "name": "bluenviron/mediamtx",
+    "version": "v1.15.3",
+    "date": "2025-10-21T19:56:55Z"
+  },
   {
     "name": "kyantech/Palmr",
     "version": "v3.2.5-beta",
@@ -944,6 +919,11 @@
     "version": "v1.71.2",
     "date": "2025-10-20T15:25:52Z"
   },
+  {
+    "name": "seriousm4x/UpSnap",
+    "version": "5.2.3",
+    "date": "2025-10-19T20:50:15Z"
+  },
   {
     "name": "Part-DB/Part-DB-server",
     "version": "v2.2.1",
@@ -959,6 +939,21 @@
     "version": "v4.5.0",
     "date": "2025-10-18T22:00:50Z"
   },
+  {
+    "name": "project-zot/zot",
+    "version": "v2.1.10",
+    "date": "2025-10-18T18:46:36Z"
+  },
+  {
+    "name": "TasmoAdmin/TasmoAdmin",
+    "version": "v4.3.2",
+    "date": "2025-10-18T12:11:00Z"
+  },
+  {
+    "name": "readeck/readeck",
+    "version": "0.20.4",
+    "date": "2025-10-18T10:00:42Z"
+  },
   {
     "name": "diced/zipline",
     "version": "v4.3.2",
@@ -1109,6 +1104,11 @@
     "version": "v0.17.0",
     "date": "2025-09-19T22:23:28Z"
   },
+  {
+    "name": "saltstack/salt",
+    "version": "v3007.8",
+    "date": "2025-09-18T18:19:04Z"
+  },
   {
     "name": "docmost/docmost",
     "version": "v0.23.2",

install/immich-install.sh

@@ -290,7 +290,7 @@ GEO_DIR="${INSTALL_DIR}/geodata"
 mkdir -p "$INSTALL_DIR"
 mkdir -p {"${APP_DIR}","${UPLOAD_DIR}","${GEO_DIR}","${INSTALL_DIR}"/cache}
 
-fetch_and_deploy_gh_release "immich" "immich-app/immich" "tarball" "v2.3.1" "$SRC_DIR"
+fetch_and_deploy_gh_release "immich" "immich-app/immich" "tarball" "v2.2.3" "$SRC_DIR"
 
 msg_info "Installing ${APPLICATION} (patience)"
 

install/karakeep-install.sh

@@ -64,7 +64,7 @@ export DATA_DIR=/opt/karakeep_data
 karakeep_SECRET=$(openssl rand -base64 36 | cut -c1-24)
 mkdir -p /etc/karakeep
 cat <<EOF >/etc/karakeep/karakeep.env
-SERVER_VERSION="$(sed 's/^v//' ~/.karakeep)"
+SERVER_VERSION="$(cat ~/.karakeep)"
 NEXTAUTH_SECRET="$karakeep_SECRET"
 NEXTAUTH_URL="http://localhost:3000"
 DATA_DIR=${DATA_DIR}

misc/alpine-install.func

@@ -13,17 +13,14 @@ load_functions
 verb_ip6() {
   set_std_mode # Set STD mode based on VERBOSE
 
-  if [ "$IPV6_METHOD" == "disable" ]; then
+  if [ "$IPV6_METHOD" == "none" ] || [ "$DISABLEIPV6" == "yes" ]; then
-    msg_info "Disabling IPv6 (this may affect some services)"
+    msg_info "Disabling IPv6"
     $STD sysctl -w net.ipv6.conf.all.disable_ipv6=1
     $STD sysctl -w net.ipv6.conf.default.disable_ipv6=1
     $STD sysctl -w net.ipv6.conf.lo.disable_ipv6=1
-    mkdir -p /etc/sysctl.d
+    echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf
-    $STD tee /etc/sysctl.d/99-disable-ipv6.conf >/dev/null <<EOF
+    echo "net.ipv6.conf.default.disable_ipv6 = 1" >>/etc/sysctl.conf
-net.ipv6.conf.all.disable_ipv6 = 1
+    echo "net.ipv6.conf.lo.disable_ipv6 = 1" >>/etc/sysctl.conf
-net.ipv6.conf.default.disable_ipv6 = 1
-net.ipv6.conf.lo.disable_ipv6 = 1
-EOF
     $STD rc-update add sysctl default
     msg_ok "Disabled IPv6"
   fi

misc/build.func

@@ -627,12 +627,11 @@ advanced_settings() {
   # IPv6 Address Management selection
   while true; do
     IPV6_METHOD=$(whiptail --backtitle "Proxmox VE Helper Scripts" --menu \
-      "Select IPv6 Address Management Type:" 16 70 5 \
+      "Select IPv6 Address Management Type:" 15 58 4 \
-      "auto" "SLAAC/AUTO (recommended) - Dynamic IPv6 from network" \
+      "auto" "SLAAC/AUTO (recommended, default)" \
-      "dhcp" "DHCPv6 - DHCP-assigned IPv6 address" \
+      "dhcp" "DHCPv6" \
-      "static" "Static - Manual IPv6 address configuration" \
+      "static" "Static (manual entry)" \
-      "none" "None - No IPv6 assignment (most containers)" \
+      "none" "Disabled" \
-      "disable" "Fully Disabled - (breaks some services)" \
       --default-item "auto" 3>&1 1>&2 2>&3)
     [ $? -ne 0 ] && exit_script
 
@@ -681,15 +680,7 @@ advanced_settings() {
       break
       ;;
     none)
-      echo -e "${NETWORK}${BOLD}${DGN}IPv6: ${BGN}None${CL}"
+      echo -e "${NETWORK}${BOLD}${DGN}IPv6: ${BGN}Disabled${CL}"
-      IPV6_ADDR="none"
-      IPV6_GATE=""
-      break
-      ;;
-    disable)
-      whiptail --backtitle "Proxmox VE Helper Scripts" --msgbox \
-        "⚠️  WARNING - FULLY DISABLE IPv6:\n\nThis will completely disable IPv6 inside the container via sysctl.\n\nSide Effects:\n  • Services requiring IPv6 will fail\n  • Localhost IPv6 (::1) will not work\n  • Some applications may not start\n\nOnly use if you have a specific reason to completely disable IPv6.\n\nFor most use cases, select 'None' instead." 14 70
-      echo -e "${NETWORK}${BOLD}${DGN}IPv6: ${BGN}Fully Disabled (IPv6 disabled via sysctl)${CL}"
       IPV6_ADDR="none"
       IPV6_GATE=""
       break

misc/install.func

@@ -15,16 +15,12 @@ load_functions
 verb_ip6() {
   set_std_mode # Set STD mode based on VERBOSE
 
-  if [ "$IPV6_METHOD" == "disable" ]; then
+  if [ "$IPV6_METHOD" == "none" ] || [ "$DISABLEIPV6" == "yes" ]; then
-    msg_info "Disabling IPv6 (this may affect some services)"
+    msg_info "Disabling IPv6"
-    mkdir -p /etc/sysctl.d
+    $STD echo "net.ipv6.conf.all.disable_ipv6 = 1" >>/etc/sysctl.conf
-    $STD tee /etc/sysctl.d/99-disable-ipv6.conf >/dev/null <<EOF
+    $STD echo "net.ipv6.conf.default.disable_ipv6 = 1" >>/etc/sysctl.conf
-# Disable IPv6 (set by community-scripts)
+    $STD echo "net.ipv6.conf.lo.disable_ipv6 = 1" >>/etc/sysctl.conf
-net.ipv6.conf.all.disable_ipv6 = 1
+    $STD sysctl -p
-net.ipv6.conf.default.disable_ipv6 = 1
-net.ipv6.conf.lo.disable_ipv6 = 1
-EOF
-    $STD sysctl -p /etc/sysctl.d/99-disable-ipv6.conf
     msg_ok "Disabled IPv6"
   fi
 }

misc/tools.func

@@ -3577,39 +3577,62 @@ function setup_nodejs() {
     fi
   fi
 }
+
+# ------------------------------------------------------------------------------
+# Installs PHP with selected modules and configures Apache/FPM support.
+#
+# Description:
+#   - Adds Sury PHP repo if needed
+#   - Installs default and user-defined modules
+#   - Patches php.ini for CLI, Apache, and FPM as needed
+#
+# Variables:
+#   PHP_VERSION                - PHP version to install (default: 8.4)
+#   PHP_MODULE                 - Additional comma-separated modules
+#   PHP_APACHE                 - Set YES to enable PHP with Apache
+#   PHP_FPM                    - Set YES to enable PHP-FPM
+#   PHP_MEMORY_LIMIT           - (default: 512M)
+#   PHP_UPLOAD_MAX_FILESIZE    - (default: 128M)
+#   PHP_POST_MAX_SIZE          - (default: 128M)
+#   PHP_MAX_EXECUTION_TIME     - (default: 300)
+# ------------------------------------------------------------------------------
+
 function setup_php() {
   local PHP_VERSION="${PHP_VERSION:-8.4}"
   local PHP_MODULE="${PHP_MODULE:-}"
   local PHP_APACHE="${PHP_APACHE:-NO}"
   local PHP_FPM="${PHP_FPM:-NO}"
+  local DISTRO_ID DISTRO_CODENAME
+  DISTRO_ID=$(awk -F= '/^ID=/{print $2}' /etc/os-release | tr -d '"')
+  DISTRO_CODENAME=$(awk -F= '/^VERSION_CODENAME=/{print $2}' /etc/os-release)
 
   local DEFAULT_MODULES="bcmath,cli,curl,gd,intl,mbstring,opcache,readline,xml,zip"
   local COMBINED_MODULES
+
   local PHP_MEMORY_LIMIT="${PHP_MEMORY_LIMIT:-512M}"
   local PHP_UPLOAD_MAX_FILESIZE="${PHP_UPLOAD_MAX_FILESIZE:-128M}"
   local PHP_POST_MAX_SIZE="${PHP_POST_MAX_SIZE:-128M}"
   local PHP_MAX_EXECUTION_TIME="${PHP_MAX_EXECUTION_TIME:-300}"
 
+  # Merge default + user-defined modules
   if [[ -n "$PHP_MODULE" ]]; then
     COMBINED_MODULES="${DEFAULT_MODULES},${PHP_MODULE}"
   else
     COMBINED_MODULES="${DEFAULT_MODULES}"
   fi
 
+  # Deduplicate
   COMBINED_MODULES=$(echo "$COMBINED_MODULES" | tr ',' '\n' | awk '!seen[$0]++' | paste -sd, -)
 
-  # Ensure PHP version exists
+  # Get current PHP-CLI version
-  if ! apt-cache show "php${PHP_VERSION}" >/dev/null 2>&1; then
+  local CURRENT_PHP=""
-    msg_error "PHP ${PHP_VERSION} is not available in repositories"
+  CURRENT_PHP=$(is_tool_installed "php" 2>/dev/null) || true
-    return 1
-  fi
 
-  # Remove all existing PHP versions
+  # Scenario 1: Already at target version - just update packages
-  msg_info "Removing existing PHP versions"
+  if [[ -n "$CURRENT_PHP" && "$CURRENT_PHP" == "$PHP_VERSION" ]]; then
-  apt purge -y 'php[0-9]*' >/dev/null 2>&1 || true
+    msg_info "Update PHP $PHP_VERSION"
-  msg_ok "Removed existing PHP"
 
-  # Ensure Sury repo
+    # Ensure Sury repo is available
     if [[ ! -f /etc/apt/sources.list.d/php.sources ]]; then
       manage_tool_repository "php" "$PHP_VERSION" "" "https://packages.sury.org/debsuryorg-archive-keyring.deb" || {
         msg_error "Failed to setup PHP repository"
@@ -3619,67 +3642,92 @@ function setup_php() {
 
     ensure_apt_working || return 1
 
-  # Install base PHP
+    # Perform upgrade with retry logic (non-fatal if fails)
-  msg_info "Installing PHP ${PHP_VERSION}"
+    upgrade_packages_with_retry "php${PHP_VERSION}" || true
-  install_packages_with_retry "php${PHP_VERSION}" || {
+
-    msg_error "Failed to install PHP"
+    cache_installed_version "php" "$PHP_VERSION"
+    msg_ok "Update PHP $PHP_VERSION"
+  else
+    # Scenario 2: Different version installed - clean upgrade
+    if [[ -n "$CURRENT_PHP" && "$CURRENT_PHP" != "$PHP_VERSION" ]]; then
+      msg_info "Upgrade PHP from $CURRENT_PHP to $PHP_VERSION"
+      # Stop and disable ALL PHP-FPM versions
+      stop_all_services "php.*-fpm"
+      remove_old_tool_version "php"
+    else
+      msg_info "Setup PHP $PHP_VERSION"
+    fi
+
+    # Prepare repository (cleanup + validation)
+    prepare_repository_setup "php" "deb.sury.org-php" || {
+      msg_error "Failed to prepare PHP repository"
       return 1
     }
 
-  # Install modules
+    # Setup Sury repository
-  IFS=',' read -ra MODULES <<<"${COMBINED_MODULES}"
+    manage_tool_repository "php" "$PHP_VERSION" "" "https://packages.sury.org/debsuryorg-archive-keyring.deb" || {
+      msg_error "Failed to setup PHP repository"
+      return 1
+    }
+
+    ensure_apt_working || return 1
+  fi
+
+  # Build module list
+  local MODULE_LIST="php${PHP_VERSION}"
+  IFS=',' read -ra MODULES <<<"$COMBINED_MODULES"
   for mod in "${MODULES[@]}"; do
     if apt-cache show "php${PHP_VERSION}-${mod}" >/dev/null 2>&1; then
-      install_packages_with_retry "php${PHP_VERSION}-${mod}"
+      MODULE_LIST+=" php${PHP_VERSION}-${mod}"
-    else
-      msg_error "Module not found: php${PHP_VERSION}-${mod}"
     fi
   done
-
-  # Apache support
-  if [[ "$PHP_APACHE" == "YES" ]]; then
-    install_packages_with_retry "apache2" "libapache2-mod-php${PHP_VERSION}" || {
-      msg_error "Failed to install Apache PHP module"
-      return 1
-    }
-  fi
-
-  # PHP-FPM support
   if [[ "$PHP_FPM" == "YES" ]]; then
-    install_packages_with_retry "php${PHP_VERSION}-fpm" || {
+    MODULE_LIST+=" php${PHP_VERSION}-fpm"
-      msg_error "Failed to install PHP-FPM"
+  fi
+
+  # install apache2 with PHP support if requested
+  if [[ "$PHP_APACHE" == "YES" ]]; then
+    if ! dpkg -l 2>/dev/null | grep -q "libapache2-mod-php${PHP_VERSION}"; then
+      install_packages_with_retry "apache2" "libapache2-mod-php${PHP_VERSION}" || {
+        msg_error "Failed to install Apache with PHP module"
         return 1
       }
     fi
-
-  # Activate CLI PHP version
-  if [[ -x "/usr/bin/php${PHP_VERSION}" ]]; then
-    update-alternatives --set php "/usr/bin/php${PHP_VERSION}" >/dev/null 2>&1 || true
   fi
 
-  # Patch php.ini
+  # Install PHP packages with retry logic
+  install_packages_with_retry $MODULE_LIST || {
+    msg_error "Failed to install PHP packages"
+    return 1
+  }
+  cache_installed_version "php" "$PHP_VERSION"
+
+  # Patch all relevant php.ini files
   local PHP_INI_PATHS=("/etc/php/${PHP_VERSION}/cli/php.ini")
   [[ "$PHP_FPM" == "YES" ]] && PHP_INI_PATHS+=("/etc/php/${PHP_VERSION}/fpm/php.ini")
   [[ "$PHP_APACHE" == "YES" ]] && PHP_INI_PATHS+=("/etc/php/${PHP_VERSION}/apache2/php.ini")
-
   for ini in "${PHP_INI_PATHS[@]}"; do
-    [[ -f "$ini" ]] || continue
+    if [[ -f "$ini" ]]; then
       $STD sed -i "s|^memory_limit = .*|memory_limit = ${PHP_MEMORY_LIMIT}|" "$ini"
       $STD sed -i "s|^upload_max_filesize = .*|upload_max_filesize = ${PHP_UPLOAD_MAX_FILESIZE}|" "$ini"
       $STD sed -i "s|^post_max_size = .*|post_max_size = ${PHP_POST_MAX_SIZE}|" "$ini"
       $STD sed -i "s|^max_execution_time = .*|max_execution_time = ${PHP_MAX_EXECUTION_TIME}|" "$ini"
+    fi
   done
 
-  # Apache restart
+  # Patch Apache configuration if needed
   if [[ "$PHP_APACHE" == "YES" ]]; then
     for mod in $(ls /etc/apache2/mods-enabled/ 2>/dev/null | grep -E '^php[0-9]\.[0-9]\.conf$' | sed 's/\.conf//'); do
-      [[ "$mod" == "php${PHP_VERSION}" ]] || $STD a2dismod "$mod" || true
+      if [[ "$mod" != "php${PHP_VERSION}" ]]; then
+        $STD a2dismod "$mod" || true
+      fi
     done
+    $STD a2enmod mpm_prefork
     $STD a2enmod "php${PHP_VERSION}"
     safe_service_restart apache2 || true
   fi
 
-  # FPM restart
+  # Enable and restart PHP-FPM if requested
   if [[ "$PHP_FPM" == "YES" ]]; then
     if systemctl list-unit-files | grep -q "php${PHP_VERSION}-fpm.service"; then
       $STD systemctl enable php${PHP_VERSION}-fpm
@@ -3687,7 +3735,7 @@ function setup_php() {
     fi
   fi
 
-  msg_ok "Setup PHP ${PHP_VERSION}"
+  msg_ok "Setup PHP $PHP_VERSION"
 }
 
 # ------------------------------------------------------------------------------
@@ -4391,7 +4439,7 @@ function setup_rust() {
     }
 
     # Update to latest patch version
-    $STD rustup update "$RUST_TOOLCHAIN" </dev/null || true
+    $STD rustup update "$RUST_TOOLCHAIN" || true
 
     # Ensure PATH is updated for current shell session
     export PATH="$CARGO_BIN:$PATH"