From 63893b94be6199ef2fc56145855c06c9101183ae Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Tue, 15 Mar 2022 22:37:59 +0100 Subject: [PATCH 1/5] Remove two --times --- scripts/install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install b/scripts/install index 282e157..d4ab396 100644 --- a/scripts/install +++ b/scripts/install @@ -54,7 +54,7 @@ app=$YNH_APP_INSTANCE_NAME ### Use the execution time, given by --time, to estimate the weight of a step. ### A common way to do it is to set a weight equal to the execution time in second +1. ### The execution time is given for the duration since the previous call. So the weight should be applied to this previous call. -ynh_script_progression --message="Validating installation parameters..." --time --weight=1 +ynh_script_progression --message="Validating installation parameters..." --weight=1 ### If the app uses NGINX as web server (written in HTML/PHP in most cases), the final path should be "/var/www/$app". ### If the app provides an internal web server (or uses another application server such as uWSGI), the final path should be "/opt/yunohost/$app" @@ -67,7 +67,7 @@ ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url #================================================= # STORE SETTINGS FROM MANIFEST #================================================= -ynh_script_progression --message="Storing installation settings..." --time --weight=1 +ynh_script_progression --message="Storing installation settings..." --weight=1 ynh_app_setting_set --app=$app --key=domain --value=$domain ynh_app_setting_set --app=$app --key=path --value=$path_url From 10fd0855dbdd7e7f79e67beeb1a48a0e7286edf9 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Tue, 15 Mar 2022 22:40:58 +0100 Subject: [PATCH 2/5] Reactivate upgrade from version check --- check_process | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_process b/check_process index ed484e1..1078ef3 100644 --- a/check_process +++ b/check_process @@ -20,7 +20,7 @@ setup_private=1 setup_public=1 upgrade=1 -# upgrade=1 from_commit=9c768105e749fb961d6e15f1e020e44cc35fe81c + upgrade=1 from_commit=2ee5b9e0cfc15e36cdb63b02d6057148600f08bf backup_restore=1 multi_instance=1 port_already_use=0 From 203de9a9caddb5172de883c39cf8d8e30641cee6 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 20 Mar 2022 21:53:15 +0100 Subject: [PATCH 3/5] Fixes some typos --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index 2167a28..fa83890 100644 --- a/manifest.json +++ b/manifest.json @@ -4,7 +4,7 @@ "packaging_format": 1, "description": { "en": "With Digiwords, you can create interactive wordclouds.", - "fr": "Digiwords permet de créer des nuages de mots interactifs.)" + "fr": "Digiwords permet de créer des nuages de mots interactifs." }, "version": "0.3.2~ynh2", "url": "https://ladigitale.dev/", @@ -46,7 +46,7 @@ "type": "boolean", "help": { "en": "If public, any visitor can create word clouds and see saved ones, providing they know their secret questions and answers.", - "fr": "Si l’application est public, n’importe quel visiteur pourra créer un nuage de mots et consulter ceux sauvegardés dont ils connaissent à la fois la question secrète et la réponse." + "fr": "Si l’application est publique, n’importe quel visiteur pourra créer un nuage de mots et consulter ceux sauvegardés dont ils connaissent à la fois la question secrète et la réponse." }, "default": true } From c32f5c42c21e80a269aec4f1dda1d5c5fdeb8e0f Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 20 Mar 2022 20:53:17 +0000 Subject: [PATCH 4/5] Auto-update README --- README_fr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README_fr.md b/README_fr.md index 2494c54..aa0db62 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour ## Vue d'ensemble -Digiwords permet de créer des nuages de mots interactifs.) +Digiwords permet de créer des nuages de mots interactifs. **Version incluse :** 0.3.2~ynh2 From 0ecf09b3c27917f995c133ecd386632930d57965 Mon Sep 17 00:00:00 2001 From: Melchisedech Date: Sun, 20 Mar 2022 21:55:43 +0100 Subject: [PATCH 5/5] Update check_process --- check_process | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/check_process b/check_process index 1078ef3..aa441b5 100644 --- a/check_process +++ b/check_process @@ -28,7 +28,7 @@ ;;; Options Email= Notification=none -#;;; Upgrade options -# ; commit=9c768105e749fb961d6e15f1e020e44cc35fe81c -# ;name=Fix of the scripts 20220221. -# ;manifest_arg=domain=DOMAIN&path=PATH&language=fr&is_public=1& +;;; Upgrade options + ; commit=2ee5b9e0cfc15e36cdb63b02d6057148600f08bf + ;name=Fix of the scripts. + ;manifest_arg=domain=DOMAIN&path=PATH&language=fr&is_public=1&