bump java 21

ct/unifi.sh

@@ -28,6 +28,8 @@ function update_script() {
     exit
   fi
 
+  JAVA_VERSION="21" setup_java
+
   msg_info "Updating ${APP}"
   $STD apt update --allow-releaseinfo-change
   $STD apt install -y unifi

install/unifi-install.sh

@@ -17,7 +17,6 @@ msg_info "Installing Dependencies"
 $STD apt install -y apt-transport-https
 msg_ok "Installed Dependencies"
 
-JAVA_VERION="17" setup_java
 setup_deb822_repo \
   "unifi" \
   "https://dl.ui.com/unifi/unifi-repo.gpg" \
@@ -26,17 +25,22 @@ setup_deb822_repo \
   "ubiquiti" \
   "amd64"
 
-if ! grep -q -m1 'avx[^ ]*' /proc/cpuinfo; then
-  msg_warn "No AVX Support Detected. MongoDB v4.4 will be installed"
-  if ! dpkg -l | grep -q "libssl1.1"; then
-    curl -fsSL "https://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.1_1.1.1w-0+deb11u4_amd64.deb" -o "libssl1.1_1.1.1w-0+deb11u4_amd64.deb"
-    $STD dpkg -i libssl1.1_1.1.1w-0+deb11u4_amd64.deb
-  fi
-  MONGO_VERSION="4.4" setup_mongodb
+JAVA_VERSION="21" setup_java
+
+if lscpu | grep -q 'avx'; then
+  MONGO_VERSION="8.0" setup_mongodb
 else
-  MONGO_VERSION="7.0" setup_mongodb
+  msg_error "No AVX detected (CPU-Flag)! We have discontinued support for this. You are welcome to try it manually with a Debian LXC, but due to the many issues with Unifi, we currently only support AVX CPUs."
+  exit 10
+fi
+
+if ! dpkg -l | grep -q 'libssl1.1'; then
+  msg_info "Installing libssl (if needed)"
+  curl -fsSL "https://security.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.1_1.1.1w-0+deb11u4_amd64.deb" -o "/tmp/libssl.deb"
+  $STD dpkg -i /tmp/libssl.deb
+  rm -f /tmp/libssl.deb
+  msg_ok "Installed libssl1.1"
 fi
-msg_ok "Installed MongoDB"
 
 msg_info "Installing UniFi Network Server"
 $STD apt install -y unifi

misc/tools.func

@@ -2734,57 +2734,11 @@ EOF
       return 1
     }
 
-    # For AMD GPUs, firmware-amd-graphics requires non-free repositories
+    # AMD firmware for better GPU support
     if [[ "$os_id" == "debian" ]]; then
-      # Add non-free-firmware repository if not already present
-      if [[ ! -f /etc/apt/sources.list.d/non-free-firmware.sources ]]; then
-        if [[ "$os_codename" == "bookworm" ]]; then
-          cat <<EOF >/etc/apt/sources.list.d/non-free-firmware.sources
-Types: deb
-URIs: http://deb.debian.org/debian
-Suites: bookworm bookworm-updates
-Components: non-free-firmware
-
-Types: deb
-URIs: http://deb.debian.org/debian-security
-Suites: bookworm-security
-Components: non-free-firmware
-EOF
-        elif [[ "$os_codename" == "trixie" || "$os_codename" == "sid" ]]; then
-          cat <<EOF >/etc/apt/sources.list.d/non-free-firmware.sources
-Types: deb
-URIs: http://deb.debian.org/debian
-Suites: trixie trixie-updates
-Components: non-free-firmware
-
-Types: deb
-URIs: http://deb.debian.org/debian-security
-Suites: trixie-security
-Components: non-free-firmware
-EOF
-        fi
-        $STD apt update
-      fi
-
-      # Install AMD firmware and libdrm
-      $STD apt -y install libdrm-amdgpu1 firmware-amd-graphics 2>/dev/null || {
-        msg_warn "Failed to install AMD firmware - may need manual installation"
-      }
-    elif [[ "$os_id" == "ubuntu" ]]; then
-      # For Ubuntu, ensure multiverse is enabled (firmware-amd-graphics is in multiverse)
-      if ! grep -qE '^deb.*multiverse' /etc/apt/sources.list /etc/apt/sources.list.d/*.list 2>/dev/null; then
-        $STD add-apt-repository -y multiverse
-        $STD apt update
-      fi
-      
-      # Install AMD firmware and libdrm
-      $STD apt -y install libdrm-amdgpu1 firmware-amd-graphics 2>/dev/null || {
-        msg_warn "Failed to install AMD firmware - may need manual installation"
-      }
-    else
-      # For other distributions, try without adding repositories
-      $STD apt -y install libdrm-amdgpu1 2>/dev/null || true
+      $STD apt -y install firmware-amd-graphics 2>/dev/null || true
     fi
+    $STD apt -y install libdrm-amdgpu1 2>/dev/null || true
     ;;
 
   NVIDIA)