From 0056f100eddee051a8c627b794944b9d3ca3f2c7 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 15 Aug 2022 19:10:54 +0200
Subject: [PATCH] set relative path for --keep opt

---
 manifest.json   |  4 ++--
 scripts/upgrade | 11 +----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/manifest.json b/manifest.json
index 7e5902f..dc0686f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -23,12 +23,12 @@
         "url": "https://stylix58.netlify.app/"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 11.0.9"
     },
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm"
+        "php7.4-fpm"
     ],
     "arguments": {
         "install" : [
diff --git a/scripts/upgrade b/scripts/upgrade
index abd4457..c718f94 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -75,18 +75,9 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
-  	# Create a temporary directory
-  	tmpdir="$(mktemp -d)"
-  	cp -a "$final_path/configuration.ini" "$tmpdir/configuration.ini"
-
 	ynh_secure_remove --file="$final_path"
 	#Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" #--keep="$final_path/configuration.ini"
-
-	# Copy the admin saved settings from tmp directory to final config path 
-  	cp -a "$tmpdir/configuration.ini" "$final_path/configuration.ini" 
-	# Remove the tmp directory securely
-  	ynh_secure_remove --file="$tmpdir"
+	ynh_setup_source --dest_dir="$final_path" --keep="configuration.ini"
 fi
 
 chmod 750 "$final_path"