From 3e1753b3c7cab9c220cbff3e6e48d359dec56005 Mon Sep 17 00:00:00 2001
From: CanbiZ <47820557+MickLesk@users.noreply.github.com>
Date: Sun, 5 Oct 2025 22:29:43 +0200
Subject: [PATCH] 2fauth: bump to debian 13 (#8123)

---
 ct/2fauth.sh                     | 13 +++++++------
 frontend/public/json/2fauth.json |  2 +-
 install/2fauth-install.sh        | 33 ++++++++++++++++----------------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/ct/2fauth.sh b/ct/2fauth.sh
index cf9308d63..a98850017 100644
--- a/ct/2fauth.sh
+++ b/ct/2fauth.sh
@@ -11,7 +11,7 @@ var_cpu="${var_cpu:-1}"
 var_ram="${var_ram:-512}"
 var_disk="${var_disk:-2}"
 var_os="${var_os:-debian}"
-var_version="${var_version:-12}"
+var_version="${var_version:-13}"
 var_unprivileged="${var_unprivileged:-1}"
 
 header_info "$APP"
@@ -29,8 +29,8 @@ function update_script() {
     exit
   fi
   if check_for_gh_release "2fauth" "Bubka/2FAuth"; then
-    $STD apt-get update
-    $STD apt-get -y upgrade
+    $STD apt update
+    $STD apt -y upgrade
 
     msg_info "Creating Backup"
     mv "/opt/2fauth" "/opt/2fauth-backup"
@@ -60,10 +60,11 @@ function update_script() {
 
     msg_info "Cleaning Up"
     if dpkg -l | grep -q 'php8.2'; then
-      $STD apt-get remove --purge -y php8.2*
+      $STD apt remove --purge -y php8.2*
     fi
-    $STD apt-get -y autoremove
-    $STD apt-get -y autoclean
+    $STD apt -y autoremove
+    $STD apt -y autoclean
+    $STD apt -y clean
     msg_ok "Cleanup Completed"
     msg_ok "Updated Successfully"
   fi
diff --git a/frontend/public/json/2fauth.json b/frontend/public/json/2fauth.json
index 857b188d6..b69b860d5 100644
--- a/frontend/public/json/2fauth.json
+++ b/frontend/public/json/2fauth.json
@@ -23,7 +23,7 @@
         "ram": 512,
         "hdd": 2,
         "os": "debian",
-        "version": "12"
+        "version": "13"
       }
     }
   ],
diff --git a/install/2fauth-install.sh b/install/2fauth-install.sh
index 8b190d7f1..2ef85c879 100644
--- a/install/2fauth-install.sh
+++ b/install/2fauth-install.sh
@@ -14,9 +14,9 @@ network_check
 update_os
 
 msg_info "Installing Dependencies"
-$STD apt-get install -y \
-  lsb-release \
-  nginx
+$STD apt install -y \
+        lsb-release \
+        nginx
 msg_ok "Installed Dependencies"
 
 PHP_VERSION="8.3" PHP_MODULE="common,ctype,fileinfo,mysql,cli" PHP_FPM="YES" setup_php
@@ -31,26 +31,26 @@ $STD mariadb -u root -e "CREATE DATABASE $DB_NAME;"
 $STD mariadb -u root -e "CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASS';"
 $STD mariadb -u root -e "GRANT ALL ON $DB_NAME.* TO '$DB_USER'@'localhost'; FLUSH PRIVILEGES;"
 {
-  echo "2FAuth Credentials"
-  echo "Database User: $DB_USER"
-  echo "Database Password: $DB_PASS"
-  echo "Database Name: $DB_NAME"
+        echo "2FAuth Credentials"
+        echo "Database User: $DB_USER"
+        echo "Database Password: $DB_PASS"
+        echo "Database Name: $DB_NAME"
 } >>~/2FAuth.creds
 msg_ok "Set up Database"
 
 fetch_and_deploy_gh_release "2fauth" "Bubka/2FAuth"
 
 msg_info "Setup 2FAuth"
-cd /opt/2fauth
+cd /opt/2fauth || exit
 cp .env.example .env
 IPADDRESS=$(hostname -I | awk '{print $1}')
 sed -i -e "s|^APP_URL=.*|APP_URL=http://$IPADDRESS|" \
-  -e "s|^DB_CONNECTION=$|DB_CONNECTION=mysql|" \
-  -e "s|^DB_DATABASE=$|DB_DATABASE=$DB_NAME|" \
-  -e "s|^DB_HOST=$|DB_HOST=127.0.0.1|" \
-  -e "s|^DB_PORT=$|DB_PORT=3306|" \
-  -e "s|^DB_USERNAME=$|DB_USERNAME=$DB_USER|" \
-  -e "s|^DB_PASSWORD=$|DB_PASSWORD=$DB_PASS|" .env
+        -e "s|^DB_CONNECTION=$|DB_CONNECTION=mysql|" \
+        -e "s|^DB_DATABASE=$|DB_DATABASE=$DB_NAME|" \
+        -e "s|^DB_HOST=$|DB_HOST=127.0.0.1|" \
+        -e "s|^DB_PORT=$|DB_PORT=3306|" \
+        -e "s|^DB_USERNAME=$|DB_USERNAME=$DB_USER|" \
+        -e "s|^DB_PASSWORD=$|DB_PASSWORD=$DB_PASS|" .env
 export COMPOSER_ALLOW_SUPERUSER=1
 $STD composer update --no-plugins --no-scripts
 $STD composer install --no-dev --prefer-source --no-plugins --no-scripts
@@ -99,6 +99,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"