From c4c65397a32d5c05b1fa4dbb20d26d97461a678a 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 15:51:48 +0200
Subject: [PATCH] cleaning

---
 manifest.toml   |  3 +--
 scripts/backup  |  1 -
 scripts/restore |  1 -
 scripts/upgrade | 10 +++-------
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 1d580ee..075a607 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -20,7 +20,7 @@ code = "https://github.com/mikaku/Monitorix"
 cpe = "cpe:2.3:a:fibranet:monitorix"
 
 [integration]
-yunohost = ">= 11.2.18"
+yunohost = ">= 11.2.29"
 helpers_version = "2.1"
 architectures = "all"
 multi_instance = false
@@ -54,7 +54,6 @@ ram.runtime = "50M"
     [resources.install_dir]
     group = "www-data:r-x"
     owner = "__APP__:rwx"
-    group = "www-data:rx"
 
     [resources.data_dir]
 
diff --git a/scripts/backup b/scripts/backup
index 8331014..9ba95ee 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 ../settings/scripts/experimental_helper.sh
 source /usr/share/yunohost/helpers
diff --git a/scripts/restore b/scripts/restore
index 881a0a4..96a9cd8 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 ../settings/scripts/experimental_helper.sh
 source /usr/share/yunohost/helpers
diff --git a/scripts/upgrade b/scripts/upgrade
index 373d90c..f7647e3 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -34,14 +34,10 @@ ynh_systemctl --service="$app" --action=stop
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 
-# 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_script_progression "Upgrading source files..."
 
-    # Download, check integrity, uncompress and patch the source from manifest.toml
-    install_monitorix_package
-fi
+# Download, check integrity, uncompress and patch the source from manifest.toml
+install_monitorix_package
 
 ynh_systemctl --service="$app" --action=stop --log_path=systemd --timeout=15