Bump O to P-Scripts to Debian 13 (Trixie) (#8367)

2025-12-16 04:03:33 +01:00 · 2025-10-15 22:39:16 +02:00
parent 50ddb09cee
commit 6c8975e4aa
168 changed files with 496 additions and 360 deletions
--- a/install/oauth2-proxy-install.sh
+++ b/install/oauth2-proxy-install.sh
@ -39,6 +39,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/octoprint-install.sh
+++ b/install/octoprint-install.sh
@ -14,13 +14,13 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y git \
+$STD apt install -y git \
  libyaml-dev \
  build-essential
 msg_ok "Installed Dependencies"

 msg_info "Setup Python3"
-$STD apt-get install -y \
+$STD apt install -y \
  python3 \
  python3-dev \
  python3-pip \
@ -72,6 +72,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/odoo-install.sh
+++ b/install/odoo-install.sh
@ -58,12 +58,11 @@ sed -i \
  -e "s|^;*db_password *=.*|db_password = $DB_PASS|" \
  /etc/odoo/odoo.conf
 $STD sudo -u odoo odoo -c /etc/odoo/odoo.conf -d odoo -i base --stop-after-init
-systemctl restart odoo
 echo "${LATEST_VERSION}" >/opt/${APPLICATION}_version.txt
 msg_ok "Configured Odoo"

 msg_info "Restarting Odoo"
-
+systemctl restart odoo
 msg_ok "Restarted Odoo"

 motd_ssh
@ -72,6 +71,7 @@ customize
 msg_info "Cleaning up"
 rm -f /opt/odoo.deb
 rm -f /opt/python3-lxml-html-clean.deb
-$STD apt-get autoremove
-$STD apt-get autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/ollama-install.sh
+++ b/install/ollama-install.sh
@ -14,22 +14,35 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  build-essential \
  pkg-config
 msg_ok "Installed Dependencies"

 msg_info "Setting up Intel® Repositories"
-mkdir -p /etc/apt/keyrings
-curl -fsSL https://repositories.intel.com/gpu/intel-graphics.key | gpg --dearmor -o /etc/apt/keyrings/intel-graphics.gpg
-echo "deb [arch=amd64,i386 signed-by=/etc/apt/keyrings/intel-graphics.gpg] https://repositories.intel.com/gpu/ubuntu jammy client" >/etc/apt/sources.list.d/intel-gpu-jammy.list
-curl -fsSL https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor -o /etc/apt/keyrings/oneapi-archive-keyring.gpg
-echo "deb [signed-by=/etc/apt/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" >/etc/apt/sources.list.d/oneAPI.list
-$STD apt-get update
+mkdir -p /usr/share/keyrings
+curl -fsSL https://repositories.intel.com/gpu/intel-graphics.key | gpg --dearmor -o /usr/share/keyrings/intel-graphics.gpg
+cat <<EOF >/etc/apt/sources.list.d/intel-gpu.sources
+Types: deb
+URIs: https://repositories.intel.com/gpu/ubuntu
+Suites: jammy
+Components: client
+Architectures: amd64 i386
+Signed-By: /usr/share/keyrings/intel-graphics.gpg
+EOF
+curl -fsSL https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor -o /usr/share/keyrings/oneapi-archive-keyring.gpg
+cat <<EOF >/etc/apt/sources.list.d/oneAPI.sources
+Types: deb
+URIs: https://apt.repos.intel.com/oneapi
+Suites: all
+Components: main
+Signed-By: /usr/share/keyrings/oneapi-archive-keyring.gpg
+EOF
+$STD apt update
 msg_ok "Set up Intel® Repositories"

 msg_info "Setting Up Hardware Acceleration"
-$STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools,intel-level-zero-gpu,level-zero,level-zero-dev}
+$STD apt -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools,intel-level-zero-gpu,level-zero,level-zero-dev}
 if [[ "$CTTYPE" == "0" ]]; then
  chgrp video /dev/dri
  chmod 755 /dev/dri
@ -40,7 +53,7 @@ fi
 msg_ok "Set Up Hardware Acceleration"

 msg_info "Installing Intel® oneAPI Base Toolkit (Patience)"
-$STD apt-get install -y --no-install-recommends intel-basekit-2024.1
+$STD apt install -y --no-install-recommends intel-basekit-2024.1
 msg_ok "Installed Intel® oneAPI Base Toolkit"

 msg_info "Installing Ollama (Patience)"
@ -102,6 +115,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/omada-install.sh
+++ b/install/omada-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y jsvc
+$STD apt install -y jsvc
 msg_ok "Installed Dependencies"

 msg_info "Checking CPU Features"
@ -30,8 +30,8 @@ msg_info "Installing Azul Zulu Java"
 curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xB1998361219BD9C9" -o "/etc/apt/trusted.gpg.d/zulu-repo.asc"
 curl -fsSL "https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb" -o zulu-repo.deb
 $STD dpkg -i zulu-repo.deb
-$STD apt-get update
-$STD apt-get -y install zulu21-jre-headless
+$STD apt update
+$STD apt -y install zulu21-jre-headless
 msg_ok "Installed Azul Zulu Java"

 msg_info "Installing libssl (if needed)"
@ -44,9 +44,15 @@ fi

 msg_info "Installing MongoDB $MONGODB_VERSION"
 curl -fsSL "https://www.mongodb.org/static/pgp/server-${MONGODB_VERSION}.asc" | gpg --dearmor >/usr/share/keyrings/mongodb-server-${MONGODB_VERSION}.gpg
-echo "deb [signed-by=/usr/share/keyrings/mongodb-server-${MONGODB_VERSION}.gpg] http://repo.mongodb.org/apt/debian $(grep '^VERSION_CODENAME=' /etc/os-release | cut -d'=' -f2)/mongodb-org/${MONGODB_VERSION} main" >/etc/apt/sources.list.d/mongodb-org-${MONGODB_VERSION}.list
-$STD apt-get update
-$STD apt-get install -y mongodb-org
+cat <<EOF >/etc/apt/sources.list.d/mongodb-org-${MONGODB_VERSION}.sources
+Types: deb
+URIs: http://repo.mongodb.org/apt/debian
+Suites: $(grep '^VERSION_CODENAME=' /etc/os-release | cut -d'=' -f2)/mongodb-org/${MONGODB_VERSION}
+Components: main
+Signed-By: /usr/share/keyrings/mongodb-server-${MONGODB_VERSION}.gpg
+EOF
+$STD apt update
+$STD apt install -y mongodb-org
 msg_ok "Installed MongoDB $MONGODB_VERSION"

 msg_info "Installing Omada Controller"
@ -63,6 +69,7 @@ customize

 msg_info "Cleaning up"
 rm -rf "$OMADA_PKG" zulu-repo.deb
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/ombi-install.sh
+++ b/install/ombi-install.sh
@ -36,6 +36,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/omv-install.sh
+++ b/install/omv-install.sh
@ -22,8 +22,8 @@ EOF
 export LANG=C.UTF-8
 export DEBIAN_FRONTEND=noninteractive
 export APT_LISTCHANGES_FRONTEND=none
-$STD apt-get update
-apt-get -y --auto-remove --show-upgraded --allow-downgrades --allow-change-held-packages --no-install-recommends --option DPkg::Options::="--force-confdef" --option DPkg::Options::="--force-confold" install openmediavault-keyring openmediavault &>/dev/null
+$STD apt update
+apt -y --auto-remove --show-upgraded --allow-downgrades --allow-change-held-packages --no-install-recommends --option DPkg::Options::="--force-confdef" --option DPkg::Options::="--force-confold" install openmediavault-keyring openmediavault &>/dev/null
 omv-confdbadm populate &>/dev/null
 msg_ok "Installed OpenMediaVault"

@ -31,6 +31,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/onedev-install.sh
+++ b/install/onedev-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  default-jdk \
  git \
  git-lfs
@ -36,6 +36,7 @@ customize

 msg_info "Cleaning up"
 rm -rf /opt/onedev-latest.tar.gz
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/onlyoffice-install.sh
+++ b/install/onlyoffice-install.sh
@ -47,8 +47,14 @@ if curl -fsSL "$KEY_URL" -o "$TMP_KEY_CONTENT" && grep -q "BEGIN PGP PUBLIC KEY
  chmod 644 "$GPG_TMP"
  chown root:root "$GPG_TMP"
  mv "$GPG_TMP" /usr/share/keyrings/onlyoffice.gpg
-  echo "deb [signed-by=/usr/share/keyrings/onlyoffice.gpg] https://download.onlyoffice.com/repo/debian squeeze main" >/etc/apt/sources.list.d/onlyoffice.list
-  $STD apt-get update
+  cat <<EOF >/etc/apt/sources.list.d/onlyoffice.sources
+Types: deb
+URIs: https://download.onlyoffice.com/repo/debian
+Suites: squeeze
+Components: main
+Signed-By: /usr/share/keyrings/onlyoffice.gpg
+EOF
+  $STD apt update
  msg_ok "GPG Key Added"
 else
  msg_error "Failed to download or verify GPG key from $KEY_URL"
@ -89,17 +95,18 @@ msg_ok "Debconf Preconfiguration Done"

 msg_info "Installing ttf-mscorefonts-installer"
 echo ttf-mscorefonts-installer msttcorefonts/accepted-mscorefonts-eula select true | debconf-set-selections
-$STD apt-get install -y ttf-mscorefonts-installer
+$STD apt install -y ttf-mscorefonts-installer
 msg_ok "Installed Microsoft Core Fonts"

 msg_info "Installing ONLYOFFICE Docs"
-$STD apt-get install -y onlyoffice-documentserver
+$STD apt install -y onlyoffice-documentserver
 msg_ok "ONLYOFFICE Docs Installed"

 motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/opengist-install.sh
+++ b/install/opengist-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y git
+$STD apt install -y git
 msg_ok "Installed Dependencies"

 fetch_and_deploy_gh_release "opengist" "thomiceli/opengist" "prebuild" "latest" "/opt/opengist" "opengist*linux-amd64.tar.gz"
@ -43,6 +43,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/openhab-install.sh
+++ b/install/openhab-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  ca-certificates \
  apt-transport-https
 msg_ok "Installed Dependencies"
@ -24,9 +24,15 @@ JAVA_VERSION="21" setup_java
 msg_info "Installing openHAB"
 curl -fsSL "https://openhab.jfrog.io/artifactory/api/gpg/key/public" | gpg --dearmor -o /usr/share/keyrings/openhab.gpg
 chmod u=rw,g=r,o=r /usr/share/keyrings/openhab.gpg
-echo "deb [signed-by=/usr/share/keyrings/openhab.gpg] https://openhab.jfrog.io/artifactory/openhab-linuxpkg stable main" >/etc/apt/sources.list.d/openhab.list
+cat <<EOF >/etc/apt/sources.list.d/openhab.sources
+Types: deb
+URIs: https://openhab.jfrog.io/artifactory/openhab-linuxpkg
+Suites: stable
+Components: main
+Signed-By: /usr/share/keyrings/openhab.gpg
+EOF
 $STD apt update
-$STD apt-get -y install openhab
+$STD apt -y install openhab
 systemctl daemon-reload
 systemctl enable -q --now openhab
 msg_ok "Installed openHAB"
@ -35,6 +41,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/openobserve-install.sh
+++ b/install/openobserve-install.sh
@ -49,6 +49,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/openproject-install.sh
+++ b/install/openproject-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  apt-transport-https \
  ca-certificates
 msg_ok "Installed Dependencies"
@ -40,11 +40,11 @@ msg_ok "Set up PostgreSQL"
 msg_info "Setting up OpenProject Repository"
 curl -fsSL "https://dl.packager.io/srv/opf/openproject/key" | gpg --dearmor >/etc/apt/trusted.gpg.d/packager-io.gpg
 curl -fsSL "https://dl.packager.io/srv/opf/openproject/stable/15/installer/debian/12.repo" -o "/etc/apt/sources.list.d/openproject.list"
-$STD apt-get update
+$STD apt update
 msg_ok "Setup OpenProject Repository"

 msg_info "Installing OpenProject"
-$STD apt-get install -y openproject
+$STD apt install -y openproject
 msg_ok "Installed OpenProject"

 msg_info "Configuring OpenProject"
@ -84,6 +84,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/openwebui-install.sh
+++ b/install/openwebui-install.sh
@ -95,6 +95,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/openziti-controller-install.sh
+++ b/install/openziti-controller-install.sh
@ -16,9 +16,15 @@ update_os
 msg_info "Installing openziti"
 mkdir -p --mode=0755 /usr/share/keyrings
 curl -fsSL https://get.openziti.io/tun/package-repos.gpg | gpg --dearmor -o /usr/share/keyrings/openziti.gpg
-echo "deb [signed-by=/usr/share/keyrings/openziti.gpg] https://packages.openziti.org/zitipax-openziti-deb-stable debian main" >/etc/apt/sources.list.d/openziti.list
-$STD apt-get update
-$STD apt-get install -y openziti-controller openziti-console
+cat <<EOF >/etc/apt/sources.list.d/openziti.sources
+Types: deb
+URIs: https://packages.openziti.org/zitipax-openziti-deb-stable
+Suites: debian
+Components: main
+Signed-By: /usr/share/keyrings/openziti.gpg
+EOF
+$STD apt update
+$STD apt install -y openziti-controller openziti-console
 msg_ok "Installed openziti"

 read -r -p "${TAB3}Would you like to go through the auto configuration now? <y/N>" prompt
@ -51,6 +57,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/openziti-tunnel-install.sh
+++ b/install/openziti-tunnel-install.sh
@ -16,9 +16,15 @@ update_os
 msg_info "Installing openziti"
 mkdir -p --mode=0755 /usr/share/keyrings
 curl -sSLf https://get.openziti.io/tun/package-repos.gpg | gpg --dearmor -o /usr/share/keyrings/openziti.gpg
-echo "deb [signed-by=/usr/share/keyrings/openziti.gpg] https://packages.openziti.org/zitipax-openziti-deb-stable jammy main" >/etc/apt/sources.list.d/openziti.list
-$STD apt-get update
-$STD apt-get install -y ziti-edge-tunnel
+cat <<EOF >/etc/apt/sources.list.d/openziti.sources
+Types: deb
+URIs: https://packages.openziti.org/zitipax-openziti-deb-stable
+Suites: jammy
+Components: main
+Signed-By: /usr/share/keyrings/openziti.gpg
+EOF
+$STD apt update
+$STD apt install -y ziti-edge-tunnel
 sed -i '0,/^ExecStart/ { /^ExecStart/ { n; s|^ExecStart.*|ExecStart=/opt/openziti/bin/ziti-edge-tunnel run-host --verbose=${ZITI_VERBOSE} --identity-dir=${ZITI_IDENTITY_DIR}| } }' /usr/lib/systemd/system/ziti-edge-tunnel.service
 systemctl daemon-reload
 msg_ok "Installed openziti"
@ -39,6 +45,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/ots-install.sh
+++ b/install/ots-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
    redis-server \
    nginx \
    openssl
@ -98,6 +98,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/outline-install.sh
+++ b/install/outline-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  mkcert \
  git \
  redis
@ -85,6 +85,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/overseerr-install.sh
+++ b/install/overseerr-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y ca-certificates
+$STD apt install -y ca-certificates
 msg_ok "Installed Dependencies"

 NODE_VERSION="22" NODE_MODULE="yarn@latest" setup_nodejs
@ -47,6 +47,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/owncast-install.sh
+++ b/install/owncast-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies (Patience)"
-$STD apt-get install -y ffmpeg
+$STD apt install -y ffmpeg
 msg_ok "Installed Dependencies"

 fetch_and_deploy_gh_release "owncast" "owncast/owncast" "prebuild" "latest" "/opt/owncast" "owncast*linux-64bit.zip"
@ -40,6 +40,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/pairdrop-install.sh
+++ b/install/pairdrop-install.sh
@ -42,6 +42,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/palmr-install.sh
+++ b/install/palmr-install.sh
@ -90,6 +90,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/paperless-ai-install.sh
+++ b/install/paperless-ai-install.sh
@ -14,12 +14,12 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  build-essential
 msg_ok "Installed Dependencies"

 msg_info "Installing Python3"
-$STD apt-get install -y \
+$STD apt install -y \
  python3-pip
 msg_ok "Installed Python3"

@ -103,6 +103,7 @@ customize

 msg_info "Cleaning up"
 rm -rf /opt/v${RELEASE}.zip
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/paperless-gpt-install.sh
+++ b/install/paperless-gpt-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  gcc \
  ca-certificates \
  musl-dev \
@ -110,6 +110,7 @@ customize

 msg_info "Cleaning up"
 rm -f "$temp_file"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/paperless-ngx-install.sh
+++ b/install/paperless-ngx-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies (Patience)"
-$STD apt-get install -y \
+$STD apt install -y \
  redis \
  build-essential \
  imagemagick \
@ -41,7 +41,7 @@ fetch_and_deploy_gh_release "jbig2enc" "ie13/jbig2enc" "tarball" "latest" "/opt/
 setup_gs

 msg_info "Installing OCR Dependencies (Patience)"
-$STD apt-get install -y \
+$STD apt install -y \
  unpaper \
  icc-profiles-free \
  qpdf \
@ -202,6 +202,7 @@ customize
 msg_info "Cleaning up"
 rm -rf /opt/paperless/docker
 rm -rf /tmp/ghostscript*
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/part-db-install.sh
+++ b/install/part-db-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  ca-certificates \
  software-properties-common \
  apt-transport-https \
@ -101,6 +101,7 @@ customize
 msg_info "Cleaning up"
 rm -rf ~/database-migration-output
 rm -rf "/opt/v${RELEASE}.zip"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/paymenter-install.sh
+++ b/install/paymenter-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  git \
  nginx \
  redis-server
@ -116,7 +116,8 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"

--- a/install/peanut-install.sh
+++ b/install/peanut-install.sh
@ -15,7 +15,7 @@ network_check
 update_os

 msg_info "Installing NUT"
-$STD apt-get install -y nut-client
+$STD apt install -y nut-client
 msg_ok "Installed NUT"

 NODE_VERSION="22" NODE_MODULE="pnpm" setup_nodejs
@ -65,6 +65,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/pelican-panel-install.sh
+++ b/install/pelican-panel-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  lsb-release \
  apache2 \
  composer
@ -25,13 +25,19 @@ setup_mariadb
 msg_info "Adding PHP8.4 Repository"
 $STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
 $STD dpkg -i /tmp/debsuryorg-archive-keyring.deb
-$STD sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
-$STD apt-get update
+cat <<EOF >/etc/apt/sources.list.d/php.sources
+Types: deb
+URIs: https://packages.sury.org/php/
+Suites: $(lsb_release -sc)
+Components: main
+Signed-By: /usr/share/keyrings/deb.sury.org-php.gpg
+EOF
+$STD apt update
 msg_ok "Added PHP8.4 Repository"

 msg_info "Installing PHP"
-$STD apt-get remove -y php8.2*
-$STD apt-get install -y \
+$STD apt remove -y php8.2*
+$STD apt install -y \
  php8.4 \
  php8.4-{gd,mysql,mbstring,bcmath,xml,curl,zip,intl,sqlite3,fpm} \
  libapache2-mod-php8.4
@ -97,6 +103,7 @@ customize

 msg_info "Cleaning up"
 rm -rf "/opt/pelican-panel/panel.tar.gz"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/pelican-wings-install.sh
+++ b/install/pelican-wings-install.sh
@ -58,6 +58,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/pf2etools-install.sh
+++ b/install/pf2etools-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  apache2 \
  ca-certificates \
  git
@ -44,8 +44,9 @@ chmod -R 755 "/opt/Pf2eTools"
 msg_ok "Created Service"

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"

 motd_ssh
--- a/install/photoprism-install.sh
+++ b/install/photoprism-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies (Patience)"
-$STD apt-get install -y \
+$STD apt install -y \
  exiftool \
  ffmpeg \
  libheif1 \
@ -156,6 +156,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/phpipam-install.sh
+++ b/install/phpipam-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y php-pear
+$STD apt install -y php-pear
 msg_ok "Installed Dependencies"

 PHP_VERSION="8.2" PHP_APACHE="YES" PHP_FPM="YES" PHP_MODULE="mysql,imap,apcu,pspell,tidy,xmlrpc,gmp,ldap,common,snmp" setup_php
@ -73,6 +73,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/pialert-install.sh
+++ b/install/pialert-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get -y install \
+$STD apt -y install \
  apt-utils \
  avahi-utils \
  lighttpd \
@ -34,7 +34,7 @@ $STD apt-get -y install \
 msg_ok "Installed Dependencies"

 msg_info "Installing PHP Dependencies"
-$STD apt-get -y install \
+$STD apt -y install \
  php \
  php-cgi \
  php-fpm \
@ -46,7 +46,7 @@ service lighttpd force-reload
 msg_ok "Installed PHP Dependencies"

 msg_info "Installing Python Dependencies"
-$STD apt-get -y install \
+$STD apt -y install \
  python3-pip \
  python3-requests \
  python3-tz \
@ -101,6 +101,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/pihole-install.sh
+++ b/install/pihole-install.sh
@ -25,7 +25,7 @@ if [[ ! "$CONFIRM" =~ ^([yY][eE][sS]|[yY])$ ]]; then
 fi

 msg_info "Installing Dependencies"
-$STD apt-get install -y ufw
+$STD apt install -y ufw
 msg_ok "Installed Dependencies"

 msg_info "Installing Pi-hole"
@ -69,7 +69,7 @@ read -r -p "${TAB3}Would you like to add Unbound? <y/N> " prompt
 if [[ ${prompt,,} =~ ^(y|yes)$ ]]; then
  read -r -p "${TAB3}Unbound is configured as a recursive DNS server by default, would you like it to be configured as a forwarding DNS server (using DNS-over-TLS (DoT)) instead? <y/N> " prompt
  msg_info "Installing Unbound"
-  $STD apt-get install -y unbound
+  $STD apt install -y unbound
  cat <<EOF >/etc/unbound/unbound.conf.d/pi-hole.conf
 server:
  verbosity: 0
@ -158,6 +158,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/planka-install.sh
+++ b/install/planka-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  unzip \
  build-essential \
  python3-venv
@ -98,6 +98,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/plant-it-install.sh
+++ b/install/plant-it-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  redis \
  nginx
 msg_ok "Installed Dependencies"
@ -119,6 +119,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/plex-install.sh
+++ b/install/plex-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Setting Up Hardware Acceleration"
-$STD apt-get -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
+$STD apt -y install {va-driver-all,ocl-icd-libopencl1,intel-opencl-icd,vainfo,intel-gpu-tools}
 if [[ "$CTTYPE" == "0" ]]; then
  chgrp video /dev/dri
  chmod 755 /dev/dri
@ -26,12 +26,18 @@ msg_ok "Set Up Hardware Acceleration"

 msg_info "Setting Up Plex Media Server Repository"
 curl -fsSL https://downloads.plex.tv/plex-keys/PlexSign.key | tee /usr/share/keyrings/PlexSign.asc >/dev/null
-echo "deb [signed-by=/usr/share/keyrings/PlexSign.asc] https://downloads.plex.tv/repo/deb/ public main" >/etc/apt/sources.list.d/plexmediaserver.list
+cat <<EOF >/etc/apt/sources.list.d/plexmediaserver.sources
+Types: deb
+URIs: https://downloads.plex.tv/repo/deb/
+Suites: public
+Components: main
+Signed-By: /usr/share/keyrings/PlexSign.asc
+EOF
 msg_ok "Set Up Plex Media Server Repository"

 msg_info "Installing Plex Media Server"
-$STD apt-get update
-$STD apt-get -o Dpkg::Options::="--force-confold" install -y plexmediaserver
+$STD apt update
+$STD apt -o Dpkg::Options::="--force-confold" install -y plexmediaserver
 if [[ "$CTTYPE" == "0" ]]; then
  sed -i -e 's/^ssl-cert:x:104:plex$/render:x:104:root,plex/' -e 's/^render:x:108:root$/ssl-cert:x:108:plex/' /etc/group
 else
@ -43,6 +49,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/pocketbase-install.sh
+++ b/install/pocketbase-install.sh
@ -43,6 +43,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/pocketid-install.sh
+++ b/install/pocketid-install.sh
@ -56,6 +56,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/podman-homeassistant-install.sh
+++ b/install/podman-homeassistant-install.sh
@ -44,7 +44,7 @@ EOF
 fi

 msg_info "Installing Podman"
-$STD apt-get -y install podman
+$STD apt -y install podman
 $STD systemctl enable --now podman.socket
 echo -e 'unqualified-search-registries=["docker.io"]' >>/etc/containers/registries.conf
 msg_ok "Installed Podman"
@ -104,6 +104,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/podman-install.sh
+++ b/install/podman-install.sh
@ -44,7 +44,7 @@ EOF
 fi

 msg_info "Installing Podman"
-$STD apt-get -y install podman
+$STD apt -y install podman
 $STD systemctl enable --now podman.socket
 echo -e 'unqualified-search-registries=["docker.io"]' >>/etc/containers/registries.conf
 msg_ok "Installed Podman"
@ -83,6 +83,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/postgresql-install.sh
+++ b/install/postgresql-install.sh
@ -133,6 +133,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/privatebin-install.sh
+++ b/install/privatebin-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  nginx \
  openssl
 msg_ok "Installed Dependencies"
@ -91,6 +91,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/projectsend-install.sh
+++ b/install/projectsend-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  apache2 \
  libapache2-mod-php \
  php8.2-{pdo,mysql,mbstring,gettext,fileinfo,gd,xml,zip}
@ -85,6 +85,7 @@ customize

 msg_info "Cleaning up"
 rm -rf "/opt/projectsend-r${RELEASE}.zip"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/prometheus-alertmanager-install.sh
+++ b/install/prometheus-alertmanager-install.sh
@ -47,6 +47,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/prometheus-install.sh
+++ b/install/prometheus-install.sh
@ -48,6 +48,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/prometheus-paperless-ngx-exporter-install.sh
+++ b/install/prometheus-paperless-ngx-exporter-install.sh
@ -48,6 +48,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/prometheus-pve-exporter-install.sh
+++ b/install/prometheus-pve-exporter-install.sh
@ -58,6 +58,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/prowlarr-install.sh
+++ b/install/prowlarr-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y sqlite3
+$STD apt install -y sqlite3
 msg_ok "Installed Dependencies"

 fetch_and_deploy_gh_release "prowlarr" "Prowlarr/Prowlarr" "prebuild" "latest" "/opt/Prowlarr" "Prowlarr.master*linux-core-x64.tar.gz"
@ -48,6 +48,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/proxmox-backup-server-install.sh
+++ b/install/proxmox-backup-server-install.sh
@ -18,16 +18,17 @@ curl -fsSL "https://enterprise.proxmox.com/debian/proxmox-release-bookworm.gpg"
 cat <<EOF >>/etc/apt/sources.list
 deb http://download.proxmox.com/debian/pbs bookworm pbs-no-subscription
 EOF
-$STD apt-get update
+$STD apt update
 export DEBIAN_FRONTEND=noninteractive
 export IFUPDOWN2_NO_IFRELOAD=1
-$STD apt-get install -y proxmox-backup-server
+$STD apt install -y proxmox-backup-server
 msg_ok "Installed Proxmox Backup Server"

 motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/proxmox-datacenter-manager-install.sh
+++ b/install/proxmox-datacenter-manager-install.sh
@ -15,10 +15,16 @@ update_os

 msg_info "Installing Proxmox Datacenter Manager"
 curl -fsSL https://enterprise.proxmox.com/debian/proxmox-archive-keyring-trixie.gpg -o /usr/share/keyrings/proxmox-archive-keyring.gpg
-echo "deb [signed-by=/usr/share/keyrings/proxmox-archive-keyring.gpg] http://download.proxmox.com/debian/pdm bookworm pdm-test  " >/etc/apt/sources.list.d/pdm-test.list
-$STD apt-get update
+cat <<EOF >/etc/apt/sources.list.d/pdm-test.sources
+Types: deb
+URIs: http://download.proxmox.com/debian/pdm
+Suites: trixie
+Components: pdm-test
+Signed-By: /usr/share/keyrings/proxmox-archive-keyring.gpg
+EOF
+$STD apt update
 DEBIAN_FRONTEND=noninteractive
-$STD apt-get -o Dpkg::Options::="--force-confdef" \
+$STD apt -o Dpkg::Options::="--force-confdef" \
        -o Dpkg::Options::="--force-confold" \
        install -y proxmox-datacenter-manager \
        proxmox-datacenter-manager-ui
@ -28,6 +34,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/proxmox-mail-gateway-install.sh
+++ b/install/proxmox-mail-gateway-install.sh
@ -14,16 +14,23 @@ network_check
 update_os

 msg_info "Installing Proxmox Mail Gateway"
-curl -fsSL "https://enterprise.proxmox.com/debian/proxmox-release-bookworm.gpg" -o "/etc/apt/trusted.gpg.d/proxmox-release-bookworm.gpg"
-echo "deb http://download.proxmox.com/debian/pmg bookworm pmg-no-subscription" >/etc/apt/sources.list.d/pmg.list
-$STD apt-get update
-$STD apt-get -y install proxmox-mailgateway-container
+curl -fsSL "https://enterprise.proxmox.com/debian/proxmox-release-trixie.gpg" -o "/usr/share/keyrings/proxmox-release-trixie.gpg"
+cat <<EOF >/etc/apt/sources.list.d/pmg.sources
+Types: deb
+URIs: http://download.proxmox.com/debian/pmg
+Suites: trixie
+Components: pmg-no-subscription
+Signed-By: /usr/share/keyrings/proxmox-release-trixie.gpg
+EOF
+$STD apt update
+$STD apt -y install proxmox-mailgateway-container
 msg_ok "Installed Proxmox Mail Gateway"

 motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/ps5-mqtt-install.sh
+++ b/install/ps5-mqtt-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  jq \
  ca-certificates
 msg_ok "Installed Dependencies"
@ -86,6 +86,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/pterodactyl-panel-install.sh
+++ b/install/pterodactyl-panel-install.sh
@ -14,7 +14,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  lsb-release \
  redis \
  apache2 \
@ -23,16 +23,22 @@ msg_ok "Installed Dependencies"

 setup_mariadb

-msg_info "Adding PHP8.4 Repository"
+msg_info "Adding PHP Repository"
 $STD curl -sSLo /tmp/debsuryorg-archive-keyring.deb https://packages.sury.org/debsuryorg-archive-keyring.deb
 $STD dpkg -i /tmp/debsuryorg-archive-keyring.deb
-$STD sh -c 'echo "deb [signed-by=/usr/share/keyrings/deb.sury.org-php.gpg] https://packages.sury.org/php/ $(lsb_release -sc) main" > /etc/apt/sources.list.d/php.list'
-$STD apt-get update
-msg_ok "Added PHP8.4 Repository"
+cat <<EOF >/etc/apt/sources.list.d/php.sources
+Types: deb
+URIs: https://packages.sury.org/php/
+Suites: $(lsb_release -sc)
+Components: main
+Signed-By: /usr/share/keyrings/deb.sury.org-php.gpg
+EOF
+$STD apt update
+msg_ok "Added PHP Repository"

 msg_info "Installing PHP"
-$STD apt-get remove -y php8.2*
-$STD apt-get install -y \
+$STD apt remove -y php8.2*
+$STD apt install -y \
  php8.4 \
  php8.4-{gd,mysql,mbstring,bcmath,xml,curl,zip,intl,fpm} \
  libapache2-mod-php8.4
@ -136,6 +142,7 @@ customize
 msg_info "Cleaning up"
 rm -rf "/opt/pterodactyl-panel/panel.tar.gz"
 rm -rf "/tmp/debsuryorg-archive-keyring.deb"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/pterodactyl-wings-install.sh
+++ b/install/pterodactyl-wings-install.sh
@ -58,6 +58,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"
--- a/install/pulse-install.sh
+++ b/install/pulse-install.sh
@ -15,7 +15,7 @@ network_check
 update_os

 msg_info "Installing Dependencies"
-$STD apt-get install -y \
+$STD apt install -y \
  diffutils \
  policykit-1
 msg_ok "Installed Dependencies"
@ -63,6 +63,7 @@ motd_ssh
 customize

 msg_info "Cleaning up"
-$STD apt-get -y autoremove
-$STD apt-get -y autoclean
+$STD apt -y autoremove
+$STD apt -y autoclean
+$STD apt -y clean
 msg_ok "Cleaned"