Merge pull request #26 from nils-van-zuijlen/update-2021-04-06-2

Update to Doryphore 2021-04-06-2

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
 

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
 

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

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": {

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

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 ]]