Merge remote-tracking branch 'origin/testing' into upgrade

README.md

@@ -19,6 +19,7 @@ Webclient for Mastodon and Pleroma.
 
 **Shipped version:** 2.4.9~ynh2
 
+
 ## Screenshots
 
 ![Screenshot of Halcyon](./doc/screenshots/preview0.png)

README_fr.md

@@ -17,7 +17,8 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
 
 Client web pour Mastodon et Pleroma.
 
-**Version incluse :** 2.4.9~ynh2
+**Version incluse :** 2.4.9~ynh2
+
 
 ## Captures d'écran
 

manifest.json

@@ -19,12 +19,12 @@
         "email": "anmol@datamol.org"
     },
     "requirements": {
-        "yunohost": ">= 4.3.0"
+        "yunohost": ">= 11.0.9"
     },
     "multi_instance": true,
     "services": [
         "nginx",
-        "php7.3-fpm"
+        "php7.4-fpm"
     ],
     "arguments": {
         "install": [

scripts/_common.sh

@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-YNH_PHP_VERSION="7.3"
+YNH_PHP_VERSION="7.4"
 
 # dependencies used by the app
 pkg_dependencies="php${YNH_PHP_VERSION}-intl php${YNH_PHP_VERSION}-mbstring php${YNH_PHP_VERSION}-curl php${YNH_PHP_VERSION}-json php${YNH_PHP_VERSION}-gettext"

scripts/upgrade

@@ -79,7 +79,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=2
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/config/config.ini"
+	ynh_setup_source --dest_dir="$final_path" --keep="config/config.ini"
 fi
 
 chmod 750 "$final_path"