From 5794b5a64c3f1a7fae3567f237c01c9c6404038b Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 13 Jan 2024 13:44:05 +0100
Subject: [PATCH] cleaning

---
 conf/baikal.yaml | 2 +-
 manifest.toml    | 3 +++
 scripts/install  | 5 +----
 scripts/remove   | 2 --
 scripts/upgrade  | 5 +----
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/conf/baikal.yaml b/conf/baikal.yaml
index ae18af5..726399c 100644
--- a/conf/baikal.yaml
+++ b/conf/baikal.yaml
@@ -1,5 +1,5 @@
 system:
-    configured_version: '0.9.3'
+    configured_version: '0.9.4'
     timezone: '__TIMEZONE__'
     card_enabled: true
     cal_enabled: true
diff --git a/manifest.toml b/manifest.toml
index 86706a0..4a3139d 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -21,8 +21,11 @@ code = "https://github.com/sabre-io/Baikal"
 yunohost = ">= 11.2"
 architectures = "all"
 multi_instance = false
+
 ldap = true
+
 sso = false
+
 disk = "50M"
 ram.build = "100M"
 ram.runtime = "50M"
diff --git a/scripts/install b/scripts/install
index cb8c8a9..2827025 100644
--- a/scripts/install
+++ b/scripts/install
@@ -41,7 +41,6 @@ ynh_app_setting_set --app=$app --key=password_hash --value="$password_hash"
 #=================================================
 ynh_script_progression --message="Setting up source files..." --weight=8
 
-# Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir"
 
 chmod -R o-rwx "$install_dir"
@@ -52,10 +51,8 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
-# Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
-# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
@@ -74,7 +71,7 @@ ynh_script_progression --message="Adding a configuration file..." --weight=1
 
 path=${path%/}
 
-ynh_add_config --template="../conf/baikal.yaml" --destination="$install_dir/config/baikal.yaml"
+ynh_add_config --template="baikal.yaml" --destination="$install_dir/config/baikal.yaml"
 
 chown $app: "$install_dir/config/baikal.yaml"
 chmod 640 "$install_dir/config/baikal.yaml"
diff --git a/scripts/remove b/scripts/remove
index 61db822..ac762c0 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -14,10 +14,8 @@ source /usr/share/yunohost/helpers
 #=================================================
 ynh_script_progression --message="Removing NGINX web server configuration..." --weight=1
 
-# Remove the dedicated NGINX config
 ynh_remove_nginx_config
 
-# Remove the dedicated PHP-FPM config
 ynh_remove_fpm_config
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 4be4cb8..e9957e8 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,7 +23,6 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
 	ynh_script_progression --message="Upgrading source files..." --weight=3
 
-	# Download, check integrity, uncompress and patch the source from app.src
 	ynh_setup_source --dest_dir="$install_dir" --keep="config/baikal.yaml"
 fi
 
@@ -35,10 +34,8 @@ chown -R $app:www-data "$install_dir"
 #=================================================
 ynh_script_progression --message="Upgrading PHP-FPM configuration..." --weight=2
 
-# Create a dedicated PHP-FPM config
 ynh_add_fpm_config
 
-# Create a dedicated NGINX config
 ynh_add_nginx_config
 
 #=================================================
@@ -55,7 +52,7 @@ then
 
 	timezone=$(cat /etc/timezone)
 	path=${path%/}
-	ynh_add_config --template="../conf/baikal.yaml" --destination="$install_dir/config/baikal.yaml"
+	ynh_add_config --template="baikal.yaml" --destination="$install_dir/config/baikal.yaml"
 	chown $app: "$install_dir/config/baikal.yaml"
 	chmod 640 "$install_dir/config/baikal.yaml"
 fi