From db4cecf095375b7876929e9bd40d13b8f0c29f26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 6 Jun 2023 08:48:53 +0200
Subject: [PATCH 1/3] Fix app service config file

---
 scripts/upgrade                          | 9 ++++++++-
 sources/update_synapse_for_appservice.sh | 2 ++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index e78c188..e48f9d8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -380,7 +380,14 @@ ynh_add_config --template="../sources/update_synapse_for_appservice.sh" --destin
 
 # Ensure app-service folder has exists and the config file exit (Migration)
 mkdir -p /etc/matrix-$app/app-service
-test -e /etc/matrix-$app/conf.d/app_service.yaml || touch /etc/matrix-$app/conf.d/app_service.yaml
+if [ -e /etc/matrix-$app/conf.d/app_service.yaml ]; then
+    # ensure that the file is empty if no app service are installed (fix issue #385)
+    if [ ! "$(ls -A /etc/matrix-$app/app-service)" ]; then
+        echo "" > /etc/matrix-$app/conf.d/app_service.yaml
+    fi
+else
+    touch /etc/matrix-$app/conf.d/app_service.yaml
+fi
 
 #=================================================
 # ADVERTISE SERVICE IN ADMIN PANEL
diff --git a/sources/update_synapse_for_appservice.sh b/sources/update_synapse_for_appservice.sh
index fda5ddb..072c3dd 100644
--- a/sources/update_synapse_for_appservice.sh
+++ b/sources/update_synapse_for_appservice.sh
@@ -8,6 +8,8 @@ cp $service_config_file /tmp/app_service_backup.yaml
 
 if [ -n "$(ls /etc/matrix-$app/app-service/)" ]; then
     echo "app_service_config_files:" > $service_config_file
+else
+    echo "" > $service_config_file
 fi
 for f in $(ls /etc/matrix-$app/app-service/); do
     echo "  - /etc/matrix-$app/app-service/$f" >> $service_config_file

From 86cde3452eee4f34708e4ea21d92daee14a3ecd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Tue, 6 Jun 2023 08:57:54 +0200
Subject: [PATCH 2/3] Update manifest

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 14b9e3b..bb3cee5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
 		"en": "Instant messaging server which uses Matrix",
 		"fr": "Serveur de messagerie instantané basé sur Matrix"
 	},
-	"version": "1.84.1~ynh1",
+	"version": "1.84.1~ynh2",
 	"url": "http://matrix.org",
 	"license": "Apache-2.0",
 	"maintainer": {

From 15df27f7b20ba0dd19d077f43f5de8442b045dce Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Tue, 6 Jun 2023 06:58:02 +0000
Subject: [PATCH 3/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 c4ea1f7..0048b53 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ Instant messaging server matrix network.
 Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)
 
 
-**Shipped version:** 1.84.1~ynh1
+**Shipped version:** 1.84.1~ynh2
 ## Disclaimers / important information
 
 ## Configuration
diff --git a/README_fr.md b/README_fr.md
index 87253c7..0fa0088 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -21,7 +21,7 @@ Instant messaging server matrix network.
 Yunohost chatroom with matrix : [https://matrix.to/#/#yunohost:matrix.org](https://matrix.to/#/#yunohost:matrix.org)
 
 
-**Version incluse :** 1.84.1~ynh1
+**Version incluse :** 1.84.1~ynh2
 ## Avertissements / informations importantes
 
 ## Configuration