From 6e7a88a2c97d618b0e74a033966702501e3f2329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 12 May 2024 13:30:34 +0200
Subject: [PATCH] Fix

---
 manifest.toml   |  9 ++++++---
 scripts/install |  4 ++--
 scripts/upgrade | 20 +++++++-------------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index e00af3f..10a4482 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,11 +17,14 @@ admindoc = "https://docs.directorylister.com/"
 code = "https://github.com/DirectoryLister/DirectoryLister"
 
 [integration]
-yunohost = ">= 11.1.21"
+yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = true
+
 ldap = false
+
 sso = false
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
@@ -51,8 +54,8 @@ ram.runtime = "50M"
 
         [resources.sources.main]
         in_subdir = false
-        url = "https://github.com/DirectoryLister/DirectoryLister/archive/refs/tags/4.0.0.tar.gz"
-        sha256 = "dba5832579cf06d158e8669510b074d1820af31632aa114704f51012b0c19143"
+        url = "https://github.com/DirectoryLister/DirectoryLister/releases/download/4.0.0/DirectoryLister-4.0.0.tar.gz"
+        sha256 = "535331654d51d822bc4cd83a81a9de6399badc21da9f039a1451bc9a6427f19a"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]
diff --git a/scripts/install b/scripts/install
index a5df223..8be7c4e 100755
--- a/scripts/install
+++ b/scripts/install
@@ -27,7 +27,7 @@ chown -R $app:www-data "$install_dir"
 ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
 # Create a dedicated PHP-FPM config using the conf/php-fpm.conf or conf/extra_php-fpm.conf
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 # Create a dedicated NGINX config using the conf/nginx.conf template
 ynh_add_nginx_config
@@ -39,7 +39,7 @@ ynh_add_nginx_config
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/.env.example" --destination="$install_dir/.env"
+ynh_add_config --template=".env.example" --destination="$install_dir/.env"
 
 chmod 400 "$install_dir/.env"
 chown $app:$app "$install_dir/.env"
diff --git a/scripts/upgrade b/scripts/upgrade
index 2904566..1e5ccc4 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -9,21 +9,15 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-upgrade_type=$(ynh_check_app_version_changed)
-
 #=================================================
 # "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...)
 #=================================================
 # 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" --keep=".env"
-fi
+# Download, check integrity, uncompress and patch the source from app.src
+ynh_setup_source --dest_dir="$install_dir" --keep=".env"
 
 chown -R $app:www-data "$install_dir"
 
@@ -32,7 +26,7 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
 
-ynh_add_fpm_config --usage=low --footprint=low
+ynh_add_fpm_config
 
 ynh_add_nginx_config
 
@@ -43,10 +37,10 @@ ynh_add_nginx_config
 #=================================================
 #ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-#ynh_add_config --template="some_config_file" --destination="$install_dir/some_config_file"
+#ynh_add_config --template=".env.example" --destination="$install_dir/.env"
 
-#chmod 400 "$install_dir/some_config_file"
-#chown $app:$app "$install_dir/some_config_file"
+#chmod 400 "$install_dir/.env"
+#chown $app:$app "$install_dir/.env"
 
 #=================================================
 # END OF SCRIPT