From 8fcfc49e46ec161ddb308aba9df8ffe99ba5fcf7 Mon Sep 17 00:00:00 2001
From: Nils VAN ZUIJLEN <nils.van-zuijlen@mailo.com>
Date: Tue, 6 Apr 2021 17:41:15 +0200
Subject: [PATCH 1/3] Update to Doryphore 2021-04-06-2

Use a md5sum hash because it's provided in the YesWiki repository
---
 README.md     | 2 +-
 README_fr.md  | 2 +-
 conf/app.src  | 6 +++---
 manifest.json | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 611cfd8..6c92802 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ However, with a YesWiki we can build a website with multiple uses:
 - Communicate information flows
 - Cultivate a bit of freedom...
 
-**Shipped version:** Doryphore 2020-11-30-4
+**Shipped version:** Doryphore 2021-04-06-2
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 83e06c6..058b3b6 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -19,7 +19,7 @@ Néanmoins, avec un YesWiki on peut fabriquer un site internet aux usages multip
 - Faire communiquer des flux d'informations
 - Cultiver un bout de liberté...
 
-**Version incluse :** Doryphore 2020-11-30-4
+**Version incluse :** Doryphore 2021-04-06-2
 
 ## Captures d'écran
 
diff --git a/conf/app.src b/conf/app.src
index b3279b9..cce5410 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,6 +1,6 @@
-SOURCE_URL=https://repository.yeswiki.net/doryphore/yeswiki-doryphore-2020-11-30-4.zip
-SOURCE_SUM=acf3b133dd547440fde99c5a7c031181a7806586781986bbb37637a4cce6d758
-SOURCE_SUM_PRG=sha256sum
+SOURCE_URL=https://repository.yeswiki.net/doryphore/yeswiki-doryphore-2021-04-06-2.zip
+SOURCE_SUM=44b225e9dff99a415ff72e1d02225ac8
+SOURCE_SUM_PRG=md5sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=true
 SOURCE_FILENAME=doryphore
diff --git a/manifest.json b/manifest.json
index 81f4d61..8228627 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Wiki that is quick and easy to use.",
         "fr": "Wiki facile et rapide à prendre en main."
     },
-    "version": "2020-11-30-4~ynh2",
+    "version": "2021-04-06-2~ynh1",
     "url": "https://yeswiki.net/",
     "license": "AGPL-3.0-only",
     "maintainer": {

From 2de8f0b821da1dbce1945eb7aacd920a9d8aad09 Mon Sep 17 00:00:00 2001
From: Nils VAN ZUIJLEN <nils.van-zuijlen@mailo.com>
Date: Fri, 16 Apr 2021 11:22:17 +0200
Subject: [PATCH 2/3] Replace the version number in wakka.config.php

---
 scripts/upgrade | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 764d0c7..c83fea1 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,6 +84,9 @@ then
 	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$final_path"
 
+	ynh_replace_string --match_string="yeswiki_release' \?=> \?'.*',$"\
+		 --replace_string="yeswiki_release' => '$(ynh_app_upstream_version)',"\
+		 --target_file="$final_path/wakka.config.php"
 fi
 
 if [[ $(ynh_app_setting_get --app=$app --key=loginldap_version) != $loginldap_version ]]

From da9deb6fff575125cefc4ad844077972e84585c0 Mon Sep 17 00:00:00 2001
From: Nils VAN ZUIJLEN <nils.van-zuijlen@mailo.com>
Date: Fri, 16 Apr 2021 11:58:38 +0200
Subject: [PATCH 3/3] Fix permissions on restore

---
 scripts/restore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/restore b/scripts/restore
index e4144ae..5116ebe 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -73,6 +73,7 @@ ynh_system_user_create --username=$app
 
 # Restore permissions on app files
 chown -R root: $final_path
+chown -R $app $final_path/{cache,files,themes,tools,wakka.config.php}
 
 #=================================================
 # RESTORE THE PHP-FPM CONFIGURATION