From 170c6a49e8e2d336c518ecb05e9b16c5ed36d9e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sat, 31 Aug 2024 22:01:14 +0200
Subject: [PATCH] cleaning

---
 manifest.toml   | 2 +-
 scripts/backup  | 1 -
 scripts/install | 6 ++----
 scripts/remove  | 4 ++--
 scripts/restore | 7 ++-----
 scripts/upgrade | 6 ++----
 6 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index d52fd81..b48f4c3 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -15,7 +15,7 @@ demo = "https://ifmdemo.gitea.de/"
 code = "https://github.com/misterunknown/ifm"
 
 [integration]
-yunohost = ">= 11.2.18"
+yunohost = ">= 11.2.29"
 helpers_version = "2.1"
 architectures = "all"
 multi_instance = true
diff --git a/scripts/backup b/scripts/backup
index c8d7c56..7918720 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
diff --git a/scripts/install b/scripts/install
index f2bd496..1f689eb 100755
--- a/scripts/install
+++ b/scripts/install
@@ -12,12 +12,10 @@ ynh_script_progression "Setting up source files..."
 
 ynh_setup_source --dest_dir="$install_dir"
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir"
 #=================================================
-# PHP-FPM CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression "Configuring PHP-FPM..."
+ynh_script_progression "Adding system configurations related to $app..."
 
 ynh_config_add_phpfpm
 
diff --git a/scripts/remove b/scripts/remove
index 2528648..ee9c6ec 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -4,9 +4,9 @@ source _common.sh
 source /usr/share/yunohost/helpers
 
 #=================================================
-# REMOVE NGINX CONFIGURATION
+# REMOVE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression "Removing NGINX web server configuration..."
+ynh_script_progression "Removing system configurations related to $app..."
 
 ynh_config_remove_nginx
 
diff --git a/scripts/restore b/scripts/restore
index 7d9b37b..2e541d7 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts
 source ../settings/scripts/_common.sh
 source /usr/share/yunohost/helpers
 
@@ -11,8 +10,6 @@ ynh_script_progression "Restoring the app main directory..."
 
 ynh_restore "$install_dir"
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir"
 #=================================================
 # RESTORE THE DATA DIRECTORY
 #=================================================
@@ -23,9 +20,9 @@ ynh_restore "$data_dir"
 chown -R $app:www-data "$data_dir"
 
 #=================================================
-# RESTORE THE PHP-FPM CONFIGURATION
+# RESTORE SYSTEM CONFIGURATIONS
 #=================================================
-ynh_script_progression "Restoring the PHP-FPM configuration..."
+ynh_script_progression "Restoring system configurations related to $app..."
 
 ynh_restore "/etc/php/$php_version/fpm/pool.d/$app.conf"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index cbef958..c23703e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -12,12 +12,10 @@ ynh_script_progression "Upgrading source files..."
 
 ynh_setup_source --dest_dir="$install_dir"
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir"
 #=================================================
-# PHP-FPM CONFIGURATION
+# UPDATE A CONFIG FILE
 #=================================================
-ynh_script_progression "Upgrading PHP-FPM configuration..."
+ynh_script_progression "Updating $app's configuration files..."
 
 ynh_config_add_phpfpm