From 1b779795fd4c73d37153a5501e14254b8635d64a Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Tue, 2 Nov 2021 12:44:57 +0100 Subject: [PATCH] version updated to 1.1.12, resolve a condition for permissions in the pre-upgrade --- README.md | 2 +- README_fr.md | 2 +- manifest.json | 2 +- scripts/upgrade | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 6148a6f..b4530af 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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. . -**Shipped version:** 1.1.11~ynh1 +**Shipped version:** 1.1.12~ynh1 **Demo:** https://garradin.eu/essai/ diff --git a/README_fr.md b/README_fr.md index 0d2cc9e..53abf20 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour 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. -**Version incluse :** 1.1.11~ynh1 +**Version incluse :** 1.1.12~ynh1 **Démo :** https://garradin.eu/essai/ diff --git a/manifest.json b/manifest.json index 728b7bf..254473c 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Software to manage association", "fr": "Logiciel libre de gestion d'association" }, - "version": "1.1.11~ynh1", + "version": "1.1.12~ynh1", "url": "http://garradin.eu", "upstream": { "license": "GPL-3.0-or-later", diff --git a/scripts/upgrade b/scripts/upgrade index 3297972..be248e0 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -80,7 +80,6 @@ fi #================================================= if ynh_compare_current_package_version --comparison lt --version 0.9.8.1~ynh1 - then ynh_script_progression --message="Upgrading upgrade to 0.9.8" --weight=5 # Download, check integrity, uncompress and patch the source from 0.9.8.src @@ -110,7 +109,7 @@ then # Create the visitors permission if needed visitors_enabled=$(ynh_permission_has_user "main" "visitors" && echo 0 || echo 1) - if [[ $visitors_enabled -eq 0 ]]; then + if [[ $visitors_enabled -eq 1 ]]; then ynh_permission_update --permission "main" --add "visitors" fi @@ -159,7 +158,7 @@ then # Create the visitors permission if needed visitors_enabled=$(ynh_permission_has_user "main" "visitors" && echo 0 || echo 1) - if [[ $visitors_enabled -eq 0 ]]; then + if [[ $visitors_enabled -eq 1 ]]; then ynh_permission_update --permission "main" --add "visitors" fi