Merge pull request #75 from yunohost-bot/auto-helpers-2.1

[autopatch] Automatic patch attempt for helpers 2.1

.gitignore

@@ -1,2 +1,3 @@
 *~
 *.sw[op]
+.DS_Store

manifest.toml

@@ -19,7 +19,7 @@ admindoc = "https://samr1.github.io/FitTrackee"
 code = "https://github.com/SamR1/FitTrackee"
 
 [integration]
-yunohost = ">= 11.2.17"
+yunohost = ">= 11.2.18"
 helpers_version = "2.1"
 architectures = "all"
 multi_instance = true

scripts/_common.sh

@@ -1,17 +1,5 @@
 #!/bin/bash
 
 #=================================================
-# COMMON VARIABLES
+# COMMON VARIABLES AND CUSTOM HELPERS
-#=================================================
-
-#=================================================
-# PERSONAL HELPERS
-#=================================================
-
-#=================================================
-# EXPERIMENTAL HELPERS
-#=================================================
-
-#=================================================
-# FUTURE OFFICIAL HELPERS
 #=================================================

scripts/install

@@ -24,7 +24,6 @@ ynh_script_progression "Configuring logrotate to manage application logfiles"
 # Use logrotate to manage application logfile(s)
 ynh_config_add_logrotate
 
-
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -34,10 +33,9 @@ ynh_config_add_logrotate
 ynh_script_progression "Setting up source files..."
 
 ynh_config_add --template=".env.production" --destination="$install_dir/.env"
-chmod 400 $install_dir/.env
+#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 $install_dir/.env
-
-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 | chown -R $app:www-data "$install_dir"
 #=================================================
 # INSTALL PYTHON DEPENDENCIES
 #=================================================

scripts/restore

@@ -16,7 +16,6 @@ ynh_script_progression "Configuring logrotate to manage application logfiles"
 # Use logrotate to manage application logfile(s)
 ynh_config_add_logrotate
 
-
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
@@ -37,10 +36,9 @@ ynh_psql_db_shell  < "./db.sql"
 ynh_script_progression "Restoring the app main directory..."
 
 ynh_restore "$install_dir"
-chmod 400 $install_dir/.env
+#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 $install_dir/.env
-
-chown -R $app: "$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: "$install_dir"
 #=================================================
 # RESTORE SYSTEMD
 #=================================================

scripts/upgrade

@@ -33,9 +33,8 @@ ynh_systemctl --action="stop" --service="${app}_workers"
 #=================================================
 ynh_script_progression "Installing dependencies..."
 
-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 | chmod -R o-rwx "$install_dir"
-chown -R $app: "$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: "$install_dir"
-
 #=================================================
 # CONFIGURE THE INSTALL SCRIPT
 #=================================================
@@ -43,8 +42,8 @@ ynh_script_progression "Installing service script..."
 
 redis_db=$(ynh_redis_get_free_db)
 ynh_config_add --template=".env.production" --destination="$install_dir/.env"
-chmod 400 $install_dir/.env
+#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod 400 $install_dir/.env
-chown $app: "$install_dir/.env"
+#REMOVEME? Assuming the file is setup using ynh_config_add, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown $app: "$install_dir/.env"
 
 #=================================================
 # INSTALL PYTHON DEPENDENCIES

sources/extra_files/app/.gitignore

@@ -1,2 +0,0 @@
-*~
-*.sw[op]

sources/patches/.gitignore

@@ -1,2 +0,0 @@
-*~
-*.sw[op]