From bc7f16ce4549e6c6d6eef2e1b4f09b9afee115d9 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 19 Aug 2024 09:17:25 +0200
Subject: [PATCH] fix

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

diff --git a/manifest.toml b/manifest.toml
index 5040886..3d2f1ad 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -16,7 +16,7 @@ admindoc = "https://miniflux.app/docs/index.html"
 code = "https://github.com/miniflux/v2"
 
 [integration]
-yunohost = ">= 11.2.18"
+yunohost = ">= 11.2.27"
 helpers_version = "2.1"
 architectures = ["amd64", "armhf", "arm64"]
 multi_instance = true
diff --git a/scripts/backup b/scripts/backup
index e431ca5..dd1b9e1 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -12,7 +12,7 @@ ynh_print_info "Declaring files to be backed up..."
 ynh_backup "$install_dir"
 
 #=================================================
-# BACKUP THE NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
 
 ynh_backup "/etc/nginx/conf.d/$domain.d/$app.conf"
diff --git a/scripts/install b/scripts/install
index 9cf3709..602468c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -24,8 +24,6 @@ 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"
 chmod +x "$install_dir/miniflux"
 
 #=================================================
diff --git a/scripts/remove b/scripts/remove
index 4dc46a3..e470210 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -7,7 +7,6 @@ source /usr/share/yunohost/helpers
 # REMOVE SYSTEM CONFIGURATIONS
 #=================================================
 # REMOVE SYSTEMD SERVICE
-
 #=================================================
 ynh_script_progression "Removing system configurations related to $app..."
 
diff --git a/scripts/restore b/scripts/restore
index bdc5f65..f08382a 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -10,15 +10,14 @@ ynh_script_progression "Restoring $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"
 chmod +x "$install_dir/miniflux"
-#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 POSTGRESQL DATABASE
 #=================================================
 ynh_script_progression "Restoring the PostgreSQL database..."
 
-ynh_psql_db_shell  < "./db.sql""
+ynh_psql_db_shell  < "./db.sql"
 
 #=================================================
 # RESTORE SYSTEM CONFIGURATIONS
diff --git a/scripts/upgrade b/scripts/upgrade
index fe27a5b..bc76738 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -13,17 +13,10 @@ ynh_systemctl --service=$app --action=stop --log_path=systemd
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
+ynh_script_progression "Upgrading source files..."
 
-# FIXME: this is still supported but the recommendation is now to *always* re-setup the app sources wether or not the upstream sources changed
-if ynh_app_upstream_version_changed
-then
-	ynh_script_progression "Upgrading source files..."
+ynh_setup_source --dest_dir=$install_dir --keep="$app.conf"
 
-	ynh_setup_source --dest_dir=$install_dir --keep="$app.conf"
-fi
-
-#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"
 chmod +x "$install_dir/miniflux"
 
 #=================================================