From e2d2301c55b0d64077c3f3a70dec9f85f5ea95cb Mon Sep 17 00:00:00 2001 From: BenoitCier Date: Tue, 2 Mar 2021 12:26:06 +0100 Subject: [PATCH 1/4] upgrade version to 1.0.6 --- 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 0507ac4..277328f 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Garradin is a free association managing software. -**Shipped version:** 1.0.5 +**Shipped version:** 1.0.6 ## Screenshots diff --git a/README_fr.md b/README_fr.md index 2f748e0..340610b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install ## Vue d'ensemble Garradin est un logiciel libre de gestion associative. il permet de gérer des membres. -**Version incluse :** 1.0.5 +**Version incluse :** 1.0.6 ## Captures d'écran diff --git a/conf/app.src b/conf/app.src index 4305613..dc2a031 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.0.5.tar.bz2 -SOURCE_SUM=a9c6479be1f388c2655ee7de671a2dc99021cb29f0fe03a195c826788e18ac30 +SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-1.0.6.tar.bz2 +SOURCE_SUM=dcb2b5481fdd9ca2544f1e1f81fff1067d6eb7189e0f8547c98f6413040cf65b SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.bz2 SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index bc4c5a7..7cef4cd 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.0.5~ynh1", + "version": "1.0.6~ynh1", "url": "http://garradin.eu/a-propos/", "license": "GPL-3.0-or-later", "maintainer": { From ab9751a09b46e7acbabb6d490728e9b2ea0b348c Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Mon, 15 Mar 2021 00:21:36 +0100 Subject: [PATCH 2/4] [autopatch] Missing ynh_abort_if_errors in change_url scripts --- scripts/change_url | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/change_url b/scripts/change_url index 449d768..88940e9 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -8,6 +8,7 @@ source _common.sh source /usr/share/yunohost/helpers +ynh_abort_if_errors #================================================= # RETRIEVE ARGUMENTS From d1b7aa2c99714eb5dcd8f6ec706503f572f822c8 Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 17 Mar 2021 00:52:27 +0100 Subject: [PATCH 3/4] add a condition in upgrade if version outdated before 0.9.8 --- conf/0.9.8.src | 6 ++++++ scripts/upgrade | 5 +++++ 2 files changed, 11 insertions(+) create mode 100644 conf/0.9.8.src diff --git a/conf/0.9.8.src b/conf/0.9.8.src new file mode 100644 index 0000000..0be6dec --- /dev/null +++ b/conf/0.9.8.src @@ -0,0 +1,6 @@ +SOURCE_URL=https://fossil.kd2.org/garradin/uv/garradin-0.9.8.1.tar.bz2 +SOURCE_SUM=7cc64b51c9721c2dd7ee510f245bcfc4693ee07f74581ad74003906eb4716ef1 +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=tar.bz2 +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= \ No newline at end of file diff --git a/scripts/upgrade b/scripts/upgrade index 34f12fb..288da31 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -25,6 +25,11 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) # CHECK VERSION #================================================= +if ynh_compare_current_package_version --comparison lt --version 0.9.8.1~ynh1; then + ynh_setup_source --dest_dir="$final_path" --source_id="0.9.8" + ynh_local_curl "/www/admin/index.php" +fi + upgrade_type=$(ynh_check_app_version_changed) #================================================= From 298db507ff673c0f8268d7fed777b76ef3116ccb Mon Sep 17 00:00:00 2001 From: Robles Rodolphe Date: Wed, 17 Mar 2021 01:33:54 +0100 Subject: [PATCH 4/4] remove ynh_local_curl --- scripts/upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 288da31..21bf618 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -27,7 +27,6 @@ phpversion=$(ynh_app_setting_get --app=$app --key=phpversion) if ynh_compare_current_package_version --comparison lt --version 0.9.8.1~ynh1; then ynh_setup_source --dest_dir="$final_path" --source_id="0.9.8" - ynh_local_curl "/www/admin/index.php" fi upgrade_type=$(ynh_check_app_version_changed)