From e1f39a0f46945cf39e0d4a7fd7c5756c65e77750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 15 Nov 2023 12:46:39 +0100
Subject: [PATCH] cleaning

---
 manifest.toml   |  3 +++
 scripts/install |  4 ++--
 scripts/remove  |  2 --
 scripts/upgrade | 12 ++++++------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 57282bb..4df9e29 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -20,8 +20,11 @@ fund = "https://liberapay.com/timokoesters/"
 yunohost = ">= 11.2"
 architectures = ["arm64", "amd64", "armhf"]
 multi_instance = false
+
 ldap = "not_relevant"
+
 sso = "not_relevant"
+
 disk = "50M"
 ram.build = "50M"
 ram.runtime = "50M"
diff --git a/scripts/install b/scripts/install
index 2c1fe1c..4864857 100755
--- a/scripts/install
+++ b/scripts/install
@@ -33,7 +33,7 @@ ynh_setup_source --dest_dir="$install_dir"
 
 chmod -R o-rwx "$install_dir"
 chown -R $app:root "$install_dir"
-chmod +x -R "$install_dir/conduit"
+chmod +x "$install_dir/conduit"
 
 #=================================================
 # SYSTEM CONFIGURATION
@@ -61,7 +61,7 @@ yunohost service add $app --description="Chat server powered by Matrix" --log="/
 #=================================================
 ynh_script_progression --message="Adding a configuration file..." --weight=1
 
-ynh_add_config --template="../conf/conduit.toml" --destination="$install_dir/conduit.toml"
+ynh_add_config --template="conduit.toml" --destination="$install_dir/conduit.toml"
 
 chmod 400 "$install_dir/conduit.toml"
 chown $app:root "$install_dir/conduit.toml"
diff --git a/scripts/remove b/scripts/remove
index 4a52fca..ed3f8fd 100755
--- a/scripts/remove
+++ b/scripts/remove
@@ -16,8 +16,6 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Removing system configurations related to $app..." --weight=1
 
-# This should be a symetric version of what happens in the install script
-
 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`)
 if ynh_exec_warn_less yunohost service status $app >/dev/null
 then
diff --git a/scripts/upgrade b/scripts/upgrade
index c70288b..02a8aab 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -29,11 +29,11 @@ then
 	ynh_script_progression --message="Upgrading source files..." --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$install_dir"
+	ynh_setup_source --dest_dir="$install_dir" --keep="conduit.toml"
 fi
 
 chown -R $app:root "$install_dir"
-chmod +x -R "$install_dir/conduit"
+chmod +x "$install_dir/conduit"
 
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
@@ -57,12 +57,12 @@ yunohost service add $app --description="Chat server powered by Matrix" --log="/
 #=================================================
 # UPDATE A CONFIG FILE
 #=================================================
-#ynh_script_progression --message="Updating a configuration file..." --weight=1
+ynh_script_progression --message="Updating a configuration file..." --weight=1
 
-#ynh_add_config --template="../conf/conduit.toml" --destination="$install_dir/conduit.toml"
+ynh_add_config --template="conduit.toml" --destination="$install_dir/conduit.toml"
 
-#chmod 400 "$install_dir/conduit.toml"
-#chown $app:$app "$install_dir/conduit.toml"
+chmod 400 "$install_dir/conduit.toml"
+chown $app:$app "$install_dir/conduit.toml"
 
 #=================================================
 # START SYSTEMD SERVICE