Merge pull request #107 from YunoHost-Apps/testing

Upgrade to 4.64

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
 

check_process

@@ -20,6 +20,8 @@
 		upgrade=1	from_commit=3cd252289f4fd138879872658762f4c6ae415cc4
 		# 4.09~ynh1
 		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

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
+# Original source is https://releases.wekan.team/raspi3/wekan-4.64-arm64.zip
-# YunoHost source is https://build.yunohost.org/apps/wekan-4.43-arm64.zip
+# YunoHost source is https://build.yunohost.org/apps/wekan-4.64-arm64.zip
-SOURCE_URL=https://build.yunohost.org/apps/wekan-4.43-arm64.zip
+SOURCE_URL=https://build.yunohost.org/apps/wekan-4.64-arm64.zip
-SOURCE_SUM=479c469a383b90a45befaa2d062761ae2f2645513d6722239b2e2c5eadc0edab
+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

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
+# Original source is https://releases.wekan.team/wekan-4.64.zip
-# YunoHost source is https://build.yunohost.org/apps/wekan-4.43.zip
+# YunoHost source is https://build.yunohost.org/apps/wekan-4.64.zip
-SOURCE_URL=https://build.yunohost.org/apps/wekan-4.43.zip
+SOURCE_URL=https://build.yunohost.org/apps/wekan-4.64.zip
-SOURCE_SUM=626718821882edc91e70b68135f5d9355364f74796d6fe7b68bfd6c4a3f22dab
+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

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": [
@@ -19,7 +19,7 @@
             "name": "ljf"
     }],
     "requirements": {
-        "yunohost": ">= 3.8"
+        "yunohost": ">= 3.8.1"
     },
     "multi_instance": true,
     "services": [

scripts/install

@@ -152,8 +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"
 
 #=================================================
 # START SYSTEMD SERVICE

scripts/restore

@@ -106,14 +106,14 @@ 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
 #=================================================
 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

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
 #=================================================
@@ -98,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" --log_type "systemd"
 fi
 
 if ynh_version_gt "1.07~ynh2" "${previous_version}" ; then
@@ -109,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" --log_type "systemd"
 fi
 
 if ynh_version_gt "2.56~ynh1" "${previous_version}" ; then
@@ -219,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
 #=================================================