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

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

diff --git a/manifest.json b/manifest.json
index 84a3785..32c3d59 100644
--- a/manifest.json
+++ b/manifest.json
@@ -21,12 +21,12 @@
         "email": "plopoyop@gmail.com"
     },
     "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.0.9"
     },
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm",
+        "php7.4-fpm",
         "mysql"
     ],
     "arguments": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 49c1c1a..5d39194 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="7.4"
 
 pkg_dependencies="acl php${YNH_PHP_VERSION}-gd php${YNH_PHP_VERSION}-zip php${YNH_PHP_VERSION}-dom php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-gmp php${YNH_PHP_VERSION}-mysql php${YNH_PHP_VERSION}-sqlite3 php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-xml"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index a3c2f04..6009efd 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -132,7 +132,7 @@ then
 	ynh_script_progression --message="Upgrading source files..."
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/data/config.php $final_path/data/users/. $final_path/extensions/."
+	ynh_setup_source --dest_dir="$final_path" --keep="data/config.php data/users/. extensions/."
 fi
 
 chmod 750 "$final_path"