From fac0b0b16d2ca506f40d57f5cc35cb9feb889f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 1 Dec 2020 09:19:19 +0100 Subject: [PATCH 1/6] Fix linter warning --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 8f5821b..88245b1 100644 --- a/manifest.json +++ b/manifest.json @@ -19,7 +19,7 @@ "name": "ljf" }], "requirements": { - "yunohost": ">= 3.8" + "yunohost": ">= 3.8.1" }, "multi_instance": true, "services": [ From 07449f5e172e99137ab77ff71c24e71773856756 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 24 Dec 2020 19:33:48 +0100 Subject: [PATCH 2/6] Upgrade to 4.64 --- README.md | 2 +- check_process | 6 +++++- conf/arm64.src | 10 +++++----- conf/x86-64.src | 10 +++++----- manifest.json | 2 +- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index c5c6e11..3f6f235 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in ## Overview Wekan is an open-source kanban board (task manager and organizer) -**Shipped version:** 4.43 +**Shipped version:** 4.64 ## Screenshots diff --git a/check_process b/check_process index db440f7..ab44a41 100644 --- a/check_process +++ b/check_process @@ -19,7 +19,9 @@ # 3.95~ynh1 upgrade=1 from_commit=3cd252289f4fd138879872658762f4c6ae415cc4 # 4.09~ynh1 - upgrade=1 from_commit=c2b4715e8591031f3054cedb1220e7619607bb36 + upgrade=1 from_commit=c2b4715e8591031f3054cedb1220e7619607bb36 + # 4.43~ynh1 + upgrade=1 from_commit=2cf63bd4d660eae4526221c1a68efede499e3ee6 backup_restore=1 multi_instance=1 # This test is no longer necessary since the version 2.7 (PR: https://github.com/YunoHost/yunohost/pull/304), you can still do it if your app could be installed with this version. @@ -41,3 +43,5 @@ Notification=down name=3.95~ynh1 ; commit=c2b4715e8591031f3054cedb1220e7619607bb36 name=4.09~ynh1 + ; commit=2cf63bd4d660eae4526221c1a68efede499e3ee6 + name=4.43~ynh1 diff --git a/conf/arm64.src b/conf/arm64.src index 158b98c..f4c2860 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,9 +1,9 @@ # This is on YunoHost server just to avoid the file from disappearing -# Original source is https://releases.wekan.team/raspi3/wekan-4.43-arm64.zip -# YunoHost source is https://build.yunohost.org/apps/wekan-4.43-arm64.zip -SOURCE_URL=https://build.yunohost.org/apps/wekan-4.43-arm64.zip -SOURCE_SUM=479c469a383b90a45befaa2d062761ae2f2645513d6722239b2e2c5eadc0edab +# Original source is https://releases.wekan.team/raspi3/wekan-4.64-arm64.zip +# YunoHost source is https://build.yunohost.org/apps/wekan-4.64-arm64.zip +SOURCE_URL=https://build.yunohost.org/apps/wekan-4.64-arm64.zip +SOURCE_SUM=220fc943263a8e025d420b29f8fbcaf1839b34ad5ff0440d2f629d004f9c642f SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=wekan-4.43-arm64.zip +SOURCE_FILENAME=wekan-4.64-arm64.zip diff --git a/conf/x86-64.src b/conf/x86-64.src index 4c1636f..532fe06 100644 --- a/conf/x86-64.src +++ b/conf/x86-64.src @@ -1,9 +1,9 @@ # This is on YunoHost server just to avoid the file from disappearing -# Original source is https://releases.wekan.team/wekan-4.43.zip -# YunoHost source is https://build.yunohost.org/apps/wekan-4.43.zip -SOURCE_URL=https://build.yunohost.org/apps/wekan-4.43.zip -SOURCE_SUM=626718821882edc91e70b68135f5d9355364f74796d6fe7b68bfd6c4a3f22dab +# Original source is https://releases.wekan.team/wekan-4.64.zip +# YunoHost source is https://build.yunohost.org/apps/wekan-4.64.zip +SOURCE_URL=https://build.yunohost.org/apps/wekan-4.64.zip +SOURCE_SUM=2a7f4486c4356ba8beb704e99c999a1ef05b06953eedff516733bc34c1e1063e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=zip SOURCE_IN_SUBDIR=true -SOURCE_FILENAME=wekan-4.43.zip +SOURCE_FILENAME=wekan-4.64.zip diff --git a/manifest.json b/manifest.json index 88245b1..814b625 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Trello-like kanban", "fr": "Un kanban similaire à Trello" }, - "version": "4.43~ynh1", + "version": "4.64~ynh1", "url": "https://wekan.io", "license": "MIT", "maintainer": [ From 7ee369e034801356efcd72e1eb8900bc32f11a51 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 24 Dec 2020 20:04:35 +0100 Subject: [PATCH 3/6] You probably don't need to call 'ynh_normalize_url_path'... --- scripts/upgrade | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 4a1070e..5eace1c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -69,13 +69,6 @@ ynh_clean_setup () { # Exit if an error occurs during the execution of the script ynh_abort_if_errors -#================================================= -# CHECK THE PATH -#================================================= - -# Normalize the URL path syntax -path_url=$(ynh_normalize_url_path --path_url=$path_url) - #================================================= # STANDARD UPGRADE STEPS #================================================= From d30ceda76df7b7970e81e069033a5592b5795c08 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 24 Dec 2020 20:05:30 +0100 Subject: [PATCH 4/6] Please add --quiet to systemctl enable/disable commands --- scripts/restore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/restore b/scripts/restore index 6907a74..24d40ff 100644 --- a/scripts/restore +++ b/scripts/restore @@ -106,7 +106,7 @@ ynh_mongo_restore_db --database="$db_name" < ./dump.bson ynh_script_progression --message="Restoring the systemd configuration..." ynh_restore_file --origin_path="/etc/systemd/system/$app.service" -systemctl enable $app.service +systemctl enable $app.service --quiet #================================================= # INTEGRATE SERVICE IN YUNOHOST From 7b8aacd32310b58716c4d5f94aa96e83b429dfc9 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 24 Dec 2020 20:07:02 +0100 Subject: [PATCH 5/6] Using option '--log_type systemd' with 'yunohost service add' is not relevant anymore --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 36dcb3c..15248aa 100644 --- a/scripts/install +++ b/scripts/install @@ -152,7 +152,7 @@ find "$final_path" -type d -print0 | xargs -0 chmod 750 #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Wekan daemon" --log_type "systemd" +yunohost service add $app --description "Wekan daemon" yunohost service add $mongodb_servicename --description "MongoDB daemon" --log "/var/log/mongodb/mongodb.log" #================================================= diff --git a/scripts/restore b/scripts/restore index 24d40ff..bbc8ced 100644 --- a/scripts/restore +++ b/scripts/restore @@ -113,7 +113,7 @@ systemctl enable $app.service --quiet #================================================= ynh_script_progression --message="Integrating service in YunoHost..." -yunohost service add $app --description "Wekan daemon" --log_type "systemd" +yunohost service add $app --description "Wekan daemon" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 5eace1c..4765c35 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -91,7 +91,7 @@ fi if ynh_version_gt "0.45-3" "${previous_version}" ; then ynh_script_progression --message="Upgrading to 0.45-3..." - yunohost service add $app --description "Wekan daemon" --log_type "systemd" + yunohost service add $app --description "Wekan daemon" fi if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then @@ -102,7 +102,7 @@ if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then rm -f /etc/apt/sources.list.d/mongodb-org-3.2.list ynh_remove_app_dependencies ynh_install_app_dependencies "mongodb mongodb-server" - yunohost service add $app --description "Wekan daemon" --log_type "systemd" + yunohost service add $app --description "Wekan daemon" fi if ynh_version_gt "2.56~ynh1" "${previous_version}" ; then From aa0a57c39211185deae842957d25551f9afffa10 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 24 Dec 2020 20:09:32 +0100 Subject: [PATCH 6/6] Found some inconsistencies in the 'yunohost service add' commands between install, upgrade and restore: --- scripts/install | 1 - scripts/upgrade | 9 +++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 15248aa..af00f9f 100644 --- a/scripts/install +++ b/scripts/install @@ -153,7 +153,6 @@ find "$final_path" -type d -print0 | xargs -0 chmod 750 ynh_script_progression --message="Integrating service in YunoHost..." yunohost service add $app --description "Wekan daemon" -yunohost service add $mongodb_servicename --description "MongoDB daemon" --log "/var/log/mongodb/mongodb.log" #================================================= # START SYSTEMD SERVICE diff --git a/scripts/upgrade b/scripts/upgrade index 4765c35..b59fd6c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -91,7 +91,6 @@ fi if ynh_version_gt "0.45-3" "${previous_version}" ; then ynh_script_progression --message="Upgrading to 0.45-3..." - yunohost service add $app --description "Wekan daemon" fi if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then @@ -102,7 +101,6 @@ if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then rm -f /etc/apt/sources.list.d/mongodb-org-3.2.list ynh_remove_app_dependencies ynh_install_app_dependencies "mongodb mongodb-server" - yunohost service add $app --description "Wekan daemon" fi if ynh_version_gt "2.56~ynh1" "${previous_version}" ; then @@ -212,6 +210,13 @@ chown -R $app: "$final_path" chmod -R 640 "$final_path" find "$final_path" -type d -print0 | xargs -0 chmod 750 +#================================================= +# INTEGRATE SERVICE IN YUNOHOST +#================================================= +ynh_script_progression --message="Integrating service in YunoHost..." + +yunohost service add $app --description "Wekan daemon" + #================================================= # START SYSTEMD SERVICE #=================================================