From ec8d555c52a526510d3c0602a3365b87b16bc79f Mon Sep 17 00:00:00 2001 From: rodinux Date: Wed, 7 Sep 2022 11:10:44 +0200 Subject: [PATCH 1/5] update to 1.1.30 --- README.md | 2 +- README_fr.md | 2 +- conf/app.src | 4 ++-- manifest.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 7fe6fe3..d9f38b0 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.28~ynh2 +**Shipped version:** 1.1.30~ynh2 **Demo:** https://garradin.eu/essai/ diff --git a/README_fr.md b/README_fr.md index 84c2d39..4d81637 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,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.28~ynh2 +**Version incluse :** 1.1.30~ynh2 **Démo :** https://garradin.eu/essai/ diff --git a/conf/app.src b/conf/app.src index 76285f2..e26d36e 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.1.28.tar.gz -SOURCE_SUM=fdddd33472142a827350280aafc416ccfae453e4a9258f87d1ec9fe8876cb492 +SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.1.30.tar.gz +SOURCE_SUM=5f2f692b299d7b24b69b222c280596b2ac3eb025eeda8a2475c2b258f4bedd58 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index 80edf6c..5f00c12 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.28~ynh2", + "version": "1.1.30~ynh1", "url": "http://garradin.eu", "upstream": { "license": "GPL-3.0-or-later", From 8350aea52f09e4a0389682cef18c59fad6e86f6e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 7 Sep 2022 09:10:59 +0000 Subject: [PATCH 2/5] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d9f38b0..5705735 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.30~ynh2 +**Shipped version:** 1.1.30~ynh1 **Demo:** https://garradin.eu/essai/ diff --git a/README_fr.md b/README_fr.md index 4d81637..267c6e7 100644 --- a/README_fr.md +++ b/README_fr.md @@ -17,7 +17,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.30~ynh2 +**Version incluse :** 1.1.30~ynh1 **Démo :** https://garradin.eu/essai/ From 6abd376d4d1039c2efb0eb20a9e4b4ecc41b6173 Mon Sep 17 00:00:00 2001 From: rodinux Date: Thu, 8 Sep 2022 11:38:40 +0200 Subject: [PATCH 3/5] try repair errors --- check_process | 4 ---- scripts/upgrade | 16 +++++----------- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/check_process b/check_process index 89a9335..2b0adb2 100644 --- a/check_process +++ b/check_process @@ -16,7 +16,6 @@ setup_public=1 upgrade=1 upgrade=1 from_commit=7205455e0a806a49c48c6d2f005d80d1b74a3355 - upgrade=1 from_commit=04e1730ff642a2e48dfb533b2136fe90f9eaf133 backup_restore=1 multi_instance=1 change_url=1 @@ -27,6 +26,3 @@ Notification=none ; commit=7205455e0a806a49c48c6d2f005d80d1b74a3355 name=Previous version manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& - ; commit=04e1730ff642a2e48dfb533b2136fe90f9eaf133 - name=Version 1.0.6~ynh1 - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& diff --git a/scripts/upgrade b/scripts/upgrade index 3b01163..32a97ce 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -97,7 +97,7 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.0~ynh1 then ynh_script_progression --message="Upgrading to 1.1.0" --weight=5 # Download, check integrity, uncompress and patch the source from 0.9.8.src - ynh_setup_source --keep="config.local.php" --dest_dir="$final_path" --source_id="1.1.0" + ynh_setup_source --keep="config.local.php" --source_id="1.1.0" # Set permissions on app files ynh_system_user_create --username=$app ynh_add_nginx_config @@ -122,20 +122,14 @@ then chown -R $app:$app $final_path chmod 755 $final_path - # Temporarily enable visitors for curl if needed - visitors_enabled=$(ynh_permission_has_user "main" "visitors" && echo yes || echo no) - if [[ $visitors_enabled == "no" ]]; then - ynh_permission_update --permission "main" --add "visitors" - fi - # Finalize the upgrade ynh_local_curl "/index.php" sleep 5 ynh_local_curl "/index.php" - if [[ $visitors_enabled == "no" ]]; then - ynh_permission_update --permission "main" --remove "visitors" - fi +# if [[ $visitors_enabled == "no" ]]; then +# ynh_permission_update --permission "main" --remove "visitors" +# fi fi #================================================= @@ -155,7 +149,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --keep="config.local.user.php" --dest_dir="$final_path" + ynh_setup_source --keep="config.local.user.php" fi #================================================= From ec286177a95338ce28ddd5dfd5d6a3516cd4d5cd Mon Sep 17 00:00:00 2001 From: rodinux Date: Fri, 9 Sep 2022 13:17:26 +0200 Subject: [PATCH 4/5] needed --dest-dir variable --- scripts/upgrade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 32a97ce..303464f 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -97,7 +97,7 @@ if ynh_compare_current_package_version --comparison lt --version 1.1.0~ynh1 then ynh_script_progression --message="Upgrading to 1.1.0" --weight=5 # Download, check integrity, uncompress and patch the source from 0.9.8.src - ynh_setup_source --keep="config.local.php" --source_id="1.1.0" + ynh_setup_source --keep="config.local.php" --dest_dir="$final_path" --source_id="1.1.0" # Set permissions on app files ynh_system_user_create --username=$app ynh_add_nginx_config @@ -149,7 +149,7 @@ then ynh_script_progression --message="Upgrading source files..." --weight=5 # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --keep="config.local.user.php" + ynh_setup_source --keep="config.local.user.php" --dest_dir="$final_path" fi #================================================= From 13f80afdeab5f2cb02255b4f69fd4c5e9130f289 Mon Sep 17 00:00:00 2001 From: rodinux Date: Fri, 9 Sep 2022 13:30:42 +0200 Subject: [PATCH 5/5] sum source changed --- conf/app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/app.src b/conf/app.src index e26d36e..8a9433c 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.1.30.tar.gz -SOURCE_SUM=5f2f692b299d7b24b69b222c280596b2ac3eb025eeda8a2475c2b258f4bedd58 +SOURCE_SUM=5525daa3ff358593642a6a75d86d3273c2dc52e426e81d308a180dcf2c04e8ec SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true