From fc4ec0853467a4558eedff26d9ecc04b9cf724f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 4 Aug 2024 18:40:41 +0200
Subject: [PATCH] php bump

---
 manifest.toml   |  2 +-
 scripts/upgrade | 28 +++++++---------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 70d35d1..43adc47 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -73,7 +73,7 @@ ram.runtime = "50M"
     main.url = "/"
 
     [resources.apt]
-    packages = "mariadb-server, php8.2-bcmath, php8.2-gmp, php8.2-fileinfo, php8.2-gd, php8.2-mbstring, php8.2-pdo, php8.2-xml, php8.2-curl, php8.2-zip, php8.2-mysql, libnss3-dev, libatk1.0-0, libatk-bridge2.0-0, libxcomposite1, libxrandr2, libasound2, libcups2, libdrm2, libxkbcommon0, libxdamage1, libxfixes3, libgbm1, libpango-1.0-0, libcairo2"
+    packages = "mariadb-server, php8.3-bcmath, php8.3-gmp, php8.3-fileinfo, php8.3-gd, php8.3-mbstring, php8.3-pdo, php8.3-xml, php8.3-curl, php8.3-zip, php8.3-mysql, libnss3-dev, libatk1.0-0, libatk-bridge2.0-0, libxcomposite1, libxrandr2, libasound2, libcups2, libdrm2, libxkbcommon0, libxdamage1, libxfixes3, libgbm1, libpango-1.0-0, libcairo2"
 
     [resources.database]
     type = "mysql"
diff --git a/scripts/upgrade b/scripts/upgrade
index 0b15889..7fab50a 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,23 +9,13 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# CHECK VERSION
-#=================================================
-
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression --message="Upgrading source files..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=1
-
-	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env public/storage"
-fi
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env public/storage"
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
@@ -62,16 +52,12 @@ email="$(ynh_user_get_info --username=$admin --key=mail)"
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
+ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-if [ "$upgrade_type" == "UPGRADE_APP" ]
-then
-       ynh_script_progression --message="Updating a configuration file..." --weight=1
+ynh_add_config --template="default.env" --destination="$install_dir/.env"
 
-       ynh_add_config --template="default.env" --destination="$install_dir/.env"
-
-       chmod 600 "$install_dir/.env"
-       chown $app:$app "$install_dir/.env"
-fi
+chmod 600 "$install_dir/.env"
+chown $app:$app "$install_dir/.env"
 
 #=================================================
 # UPGRADE DATABASE