From 2f3676b0fa0191c760edac569a8885e62b06d902 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Tue, 31 Oct 2023 14:42:15 +0000
Subject: [PATCH 1/3] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c9362e8..e9ad3d4 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ However, with a YesWiki we can build a website with multiple uses:
 * Official app website: <https://yeswiki.net/>
 * Official admin documentation: <https://yeswiki.net/?DocumentatioN>
 * Upstream app code repository: <https://github.com/YesWiki/yeswiki>
-* YunoHost documentation for this app: <https://yunohost.org/app_yeswiki>
+* YunoHost Store: <https://apps.yunohost.org/app/yeswiki>
 * Report a bug: <https://github.com/YunoHost-Apps/yeswiki_ynh/issues>
 
 ## Developer info
diff --git a/README_fr.md b/README_fr.md
index 5ae264d..3bb304c 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -39,7 +39,7 @@ Néanmoins, avec un YesWiki on peut fabriquer un site internet aux usages multip
 * Site officiel de l’app : <https://yeswiki.net/>
 * Documentation officielle de l’admin : <https://yeswiki.net/?DocumentatioN>
 * Dépôt de code officiel de l’app : <https://github.com/YesWiki/yeswiki>
-* Documentation YunoHost pour cette app : <https://yunohost.org/app_yeswiki>
+* YunoHost Store: <https://apps.yunohost.org/app/yeswiki>
 * Signaler un bug : <https://github.com/YunoHost-Apps/yeswiki_ynh/issues>
 
 ## Informations pour les développeurs

From 0602f8b2a1d8473d2a58b7642d5dae4ea3d535a5 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Sat, 9 Dec 2023 13:28:50 +0100
Subject: [PATCH 2/3] Keep ferme instances during upgrade

---
 scripts/upgrade | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index a6e85f1..ea571a4 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -21,13 +21,17 @@ upgrade_type=$(ynh_check_app_version_changed)
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Upgrading source files..." --weight=5
+    ynh_script_progression --message="Upgrading source files..." --weight=5
 
-	# Download, check integrity, uncompress and patch the source from app.src
-	# TODO : find a way to sync stable extensions list to avoid hardcoded extensions folders to keep
-	ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env wakka.config.php files custom private themes tools/accountactivationbyemail tools/advancedsearch tools/benevolat tools/ferme tools/fontautoinstall tools/ipblock tools/lms tools/login-sso tools/logincas tools/loginldap tools/maintenance tools/multideletepages tools/nextcloudconnector tools/publication tools/qrcode tools/stats tools/tabdyn tools/twolevels tools/webhooks"
+    # Download, check integrity, uncompress and patch the source from app.src
+    # TODO : find a way to sync stable extensions list to avoid hardcoded extensions folders to keep
+    ferme_instances="$(cd $install_dir; for p in $(ls -- */wakka.config.php); do dirname "$p"; done)"
+    ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env $ferme_instances wakka.config.php files custom private themes 
+tools/accountactivationbyemail tools/advancedsearch tools/benevolat tools/ferme tools/fontautoinstall tools/ipblock
+tools/lms tools/login-sso tools/logincas tools/loginldap tools/maintenance tools/multideletepages
+tools/nextcloudconnector tools/publication tools/qrcode tools/stats tools/tabdyn tools/twolevels tools/webhooks"
 
-	ynh_replace_string --match_string="yeswiki_release' \?=> \?'.*',$" --replace_string="yeswiki_release' => '$(ynh_app_upstream_version)'," --target_file="$install_dir/wakka.config.php"
+    ynh_replace_string --match_string="yeswiki_release' \?=> \?'.*',$" --replace_string="yeswiki_release' => '$(ynh_app_upstream_version)'," --target_file="$install_dir/wakka.config.php"
 fi
 
 chmod -R o-rwx "$install_dir"

From 60e07c3e2897ac5ebf4fbded3f019092deb5c803 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <4533074+alexAubin@users.noreply.github.com>
Date: Sun, 10 Dec 2023 00:53:54 +0100
Subject: [PATCH 3/3] Update scripts/upgrade: tweak to prevent unecessary
 warning

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index ea571a4..fb9ec35 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -25,7 +25,7 @@ then
 
     # Download, check integrity, uncompress and patch the source from app.src
     # TODO : find a way to sync stable extensions list to avoid hardcoded extensions folders to keep
-    ferme_instances="$(cd $install_dir; for p in $(ls -- */wakka.config.php); do dirname "$p"; done)"
+    ferme_instances="$(cd $install_dir; for p in $(ls -- */wakka.config.php 2>/dev/null); do dirname "$p"; done)"
     ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env $ferme_instances wakka.config.php files custom private themes 
 tools/accountactivationbyemail tools/advancedsearch tools/benevolat tools/ferme tools/fontautoinstall tools/ipblock
 tools/lms tools/login-sso tools/logincas tools/loginldap tools/maintenance tools/multideletepages