From 6aa0b4bbdf8022eaedf19fcd66b7f6221a1230bc Mon Sep 17 00:00:00 2001
From: Yunohost-Bot <>
Date: Sat, 31 Aug 2024 03:01:53 +0200
Subject: [PATCH] [autopatch] Automatic patch attempt for helpers 2.1

---
 manifest.toml   | 3 ++-
 scripts/install | 5 ++---
 scripts/restore | 5 ++---
 scripts/upgrade | 7 +++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 920019a..17fd5d3 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://github.com/the-djmaze/snappymail/wiki"
 code = "https://github.com/the-djmaze/snappymail"
 
 [integration]
-yunohost = ">= 11.2.20"
+yunohost = ">= 11.2.18"
 helpers_version = "2.1"
 architectures = "all"
 multi_instance = true
@@ -56,6 +56,7 @@ ram.runtime = "50M"
     [resources.system_user]
 
     [resources.install_dir]
+    group = "www-data:r-x"
 
     [resources.permissions]
     main.url = "/"
diff --git a/scripts/install b/scripts/install
index 51ef5a4..3dba071 100755
--- a/scripts/install
+++ b/scripts/install
@@ -10,9 +10,8 @@ ynh_script_progression "Setting up source files..."
 
 ynh_setup_source --dest_dir="$install_dir/app"
 
-chmod -R "u=rX,g=rX,o=" "$install_dir"
-chown -R "$app:www-data" "$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 "u=rX,g=rX,o=" "$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"
 #=================================================
 # ADD A CONFIGURATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index de26cae..838f41e 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -11,9 +11,8 @@ ynh_script_progression "Restoring the app main directory..."
 
 ynh_restore "$install_dir"
 
-chmod -R "u=rX,g=rX,o=" "$install_dir"
-chown -R "$app:www-data" "$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 "u=rX,g=rX,o=" "$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 -R "u=rwX,g=,o=" "$install_dir/app/data"
 chown -R "$app:$app" "$install_dir/app/data"
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 259642e..d479d2e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -22,11 +22,10 @@ fi
 #=================================================
 ynh_script_progression "Upgrading source files..."
 
-ynh_setup_source --dest_dir="$install_dir/app" --full_replace=1 --keep="data/_data_/_default_/configs/application.ini"
-
-chmod -R "u=rX,g=rX,o=" "$install_dir"
-chown -R "$app:www-data" "$install_dir"
+ynh_setup_source --dest_dir="$install_dir/app" --full_replace --keep="data/_data_/_default_/configs/application.ini"
 
+#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 "u=rX,g=rX,o=" "$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"
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================