Cleaning up

check_process

@@ -1,8 +1,8 @@
 ; Test complet
 	; Manifest
-		domain="domain.tld"	(DOMAIN)
-		path="/path"	(PATH)
-		is_public=1 (PUBLIC|public=1|private=0)
+		domain="domain.tld"
+		path="/path"
+		is_public=1
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -11,6 +11,14 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
+		#upgrade=1	from_commit=a36dd8b13d85078ddcee0d6d3146feb107d3e042
 		backup_restore=1
 		multi_instance=1
 		change_url=1
+;;; Options
+Email=
+Notification=none
+;;; Upgrade options
+	; commit=a36dd8b13d85078ddcee0d6d3146feb107d3e042
+		name=Merge pull request #55 from yunohost-bot/issue-and-pr-template 
+		manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666&

doc/DESCRIPTION.md

@@ -0,0 +1 @@
+Garradin (word meaning money in an aboriginal dialect of northern Australia, pronounced "gar-a-dine" em) is software for associative management. It is the tool of choice for managing an association, a sports club, an NGO, etc. It is designed to meet the needs of a small to medium-sized structure: management of members, accounting, website, note-taking in meetings, archiving and sharing of the association's operating documents, discussion between members, etc. etc. . 

doc/DESCRIPTION_fr.md

@@ -0,0 +1 @@
+Garradin (mot signifiant argent dans un dialecte aborigène du nord de l'Australie, prononcé « gar-a-dine »em) est un logiciel de gestion associative. Il est l'outil de prédilection pour gérer une association, un club sportif, une ONG, etc. Il est conçu pour répondre aux besoins d'une structure de petite à moyenne taille : gestion des adhérents, comptabilité, site web, prise de notes en réunion, archivage et partage des documents de fonctionnement de l'association, discussion entre adhérents, etc etc.

manifest.json

@@ -7,14 +7,22 @@
         "fr": "Logiciel libre de gestion d'association"
     },
     "version": "1.1.10~ynh1",
-    "url": "http://garradin.eu/a-propos/",
+    "url": "http://garradin.eu",
+    "upstream": {
+        "license": "GPL-3.0-or-later",
+        "website": "http://garradin.eu",
+        "demo": "https://garradin.eu/essai/",
+        "admindoc": "https://fossil.kd2.org/garradin/wiki?name=Documentation",
+        "userdoc": "https://yunohost.org/apps",
+        "code": "https://fossil.kd2.org/garradin/wiki?name=Garradin"
+    },
     "license": "GPL-3.0-or-later",
     "maintainer": {
         "name": "frju365",
         "email": "win10@tutanota.com"
     },
      "requirements": {
-        "yunohost": ">=4.1.7"
+        "yunohost": ">=4.2.4"
     },
     "multi_instance": true,
     "services": [

pull_request_template.md

@@ -1,16 +0,0 @@
-## Problem
-
-- *Description of why you made this PR*
-
-## Solution
-
-- *And how do you fix that problem*
-
-## PR Status
-
-- [ ] Code finished and ready to be reviewed/tested
-- [ ] The fix/enhancement were manually tested (if applicable)
-
-## Automatic tests
-
-Automatic tests can be triggered on https://ci-apps-dev.yunohost.org/ *after creating the PR*, by commenting "!testme", "!gogogadgetoci" or "By the power of systemd, I invoke The Great App CI to test this Pull Request!". (N.B. : for this to work you need to be a member of the Yunohost-Apps organization)

scripts/install

@@ -76,7 +76,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Configuring PHP-FPM..." --weight=5
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 #  ADD A CONFIGURATION
@@ -112,7 +112,7 @@ ynh_script_progression --message="Configuring permissions..." --weight=8
 # Make app public if necessary
 if [ $is_public -eq 1 ]
 then
-  ynh_permission_update --permission "main" --add "visitors"
+  ynh_permission_update --permission="main" --add="visitors"
 fi
 
 #=================================================

scripts/remove

@@ -41,7 +41,7 @@ ynh_remove_nginx_config
 ynh_script_progression --message="Removing PHP-FPM configuration..." --weight=2
 
 # Remove the dedicated PHP-FPM config
-ynh_remove_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_remove_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # GENERIC FINALIZATION

scripts/restore

@@ -45,20 +45,20 @@ test ! -d $final_path \
 
 ynh_restore_file "/etc/nginx/conf.d/$domain.d/$app.conf"
 
-#=================================================
-# RESTORE THE APP MAIN DIR
-#=================================================
-ynh_script_progression --message="Restoring Garradin main directory..." --weight=5
-
-ynh_restore_file "$final_path"
-
 #=================================================
 # RECREATE THE DEDICATED USER
 #=================================================
 ynh_script_progression --message="Recreating the dedicated system user..." --weight=3
 
 # Create the dedicated user (if not existing)
-ynh_system_user_create --username=$app
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
+#=================================================
+# RESTORE THE APP MAIN DIR
+#=================================================
+ynh_script_progression --message="Restoring Garradin main directory..." --weight=5
+
+ynh_restore_file --origin_path="$final_path"
 
 #=================================================
 # RESTORE USER RIGHTS
@@ -80,7 +80,7 @@ ynh_script_progression --message="Reconfiguring PHP-FPM..." --weight=6
 
 ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=================================================
 # GENERIC FINALIZATION
@@ -89,7 +89,7 @@ ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependenc
 #=================================================
 ynh_script_progression --message="Reloading NGINX web server and PHP-FPM..." --weight=1
 
-ynh_systemd_action --service_name=php${phpversion}-fpm --action=reload
+ynh_systemd_action --service_name=php$phpversion-fpm --action=reload
 ynh_systemd_action --service_name=nginx --action=reload
 
 #=================================================

scripts/upgrade

@@ -31,6 +31,20 @@ else
   upgrade_type=$(ynh_check_app_version_changed)
 fi
 
+#=================================================
+# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
+#=================================================
+ynh_script_progression --message="Backing up Garradin before upgrading (may take a while)..." --weight=30
+
+# Backup the current version of the app
+ynh_backup_before_upgrade
+ynh_clean_setup () {
+  # restore it if the upgrade fails
+  ynh_restore_upgradebackup
+}
+# Exit if an error occurs during the execution of the script
+ynh_abort_if_errors
+
 #=================================================
 # ENSURE DOWNWARD COMPATIBILITY
 #=================================================
@@ -65,21 +79,6 @@ if [ -e "$bdd" ]; then
   cp -a $bdd /tmp/association.sqlite
 fi
 
-#=================================================
-# BACKUP BEFORE UPGRADE THEN ACTIVE TRAP
-#=================================================
-ynh_script_progression --message="Backing up Garradin before upgrading (may take a while)..." --weight=30
-
-# Backup the current version of the app
-ynh_backup_before_upgrade
-ynh_clean_setup () {
-  # restore it if the upgrade fails
-  ynh_restore_upgradebackup
-}
-# Exit if an error occurs during the execution of the script
-ynh_abort_if_errors
-
-
 #=================================================
 # UPGRADE TO 0.9.8 if necessary
 #=================================================
@@ -136,26 +135,25 @@ then
   upgrade_type="UPGRADE_APP"
 fi
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
 ynh_script_progression --message="Upgrading source files..." --weight=5
 
-
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
   # Download, check integrity, uncompress and patch the source from app.src
   ynh_setup_source --dest_dir="$final_path"
 fi
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app
-
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
@@ -170,8 +168,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 
 # Create a dedicated PHP-FPM config
-ynh_add_fpm_config --phpversion=$YNH_PHP_VERSION --package="$extra_php_dependencies"
-phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
+ynh_add_fpm_config --package="$extra_php_dependencies"
 
 #=======================================================
 # backup bdd, squelettes directory and config.local.php