From 670638fcaf9b6b2e9f90208d728bb78c3e9a183f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Wed, 8 Mar 2023 22:28:08 +0100
Subject: [PATCH] fix

---
 manifest.toml   |  2 +-
 scripts/install | 28 +++++++---------------------
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 04d2eeb..6bea5ae 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -17,7 +17,7 @@ admindoc = "https://www.navidrome.org/docs"
 code = "https://github.com/deluan/navidrome"
 
 [integration]
-yunohost = ">= 11.1.11"
+yunohost = ">= 11.1.13"
 architectures = "all"
 multi_instance = false
 ldap = false
diff --git a/scripts/install b/scripts/install
index 5f2ce01..e22c801 100644
--- a/scripts/install
+++ b/scripts/install
@@ -23,7 +23,6 @@ enable_sharing="false"
 #=================================================
 # STORE SETTINGS FROM MANIFEST
 #=================================================
-ynh_script_progression --message="Storing installation settings..." --weight=2
 
 ynh_app_setting_set --app=$app --key=enable_downloads --value=$enable_downloads
 ynh_app_setting_set --app=$app --key=scanner_extractor --value=$scanner_extractor
@@ -40,18 +39,22 @@ ynh_script_progression --message="Setting up source files..." --weight=4
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir" --source_id=$YNH_ARCH
 
-chmod 750 "$install_dir"
 chmod -R o-rwx "$install_dir"
 chown -R $app:$app "$install_dir"
 
 #=================================================
-# NGINX CONFIGURATION
+# SYSTEM CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=3
+ynh_script_progression --message="Adding system configurations related to $app ..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+# Create a dedicated systemd config
+ynh_add_systemd_config
+
+yunohost service add $app --description="Web-based music collection server and streamer"
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================
@@ -77,23 +80,6 @@ ynh_add_config --template="../conf/navidrome.toml" --destination="$config_path/n
 chmod 600 "$config_path/navidrome.toml"
 chown -R $app:$app "$config_path"
 
-#=================================================
-# SETUP SYSTEMD
-#=================================================
-ynh_script_progression --message="Configuring a systemd service..." --weight=1
-
-# Create a dedicated systemd config
-ynh_add_systemd_config
-
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
-
-yunohost service add $app --description="Web-based music collection server and streamer"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================