From c46f0df04505f870b685dd0b8a06dce9c353c285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Thu, 28 Dec 2023 10:33:22 +0100
Subject: [PATCH] cleaning

---
 scripts/install | 15 ++++-----------
 scripts/upgrade |  9 +--------
 2 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/scripts/install b/scripts/install
index 0a2e974..2ac5f56 100644
--- a/scripts/install
+++ b/scripts/install
@@ -21,17 +21,19 @@ ynh_setup_source --dest_dir="$NETDATA_TMPDIR"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..." --weight=2
+ynh_script_progression --message="Adding system configurations related to $app..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
+yunohost service add $app --description "Real-time performance and health monitoring for systems and applications" --log "$install_dir/var/log/netdata/error.log" "$install_dir/var/log/netdata/access.log" "$install_dir/var/log/netdata/debug.log"
+
 #=================================================
 # SPECIFIC SETUP
 #=================================================
 # EXECUTE NETDATA INSTALLER
 #=================================================
-ynh_script_progression --message="Executing Netdata installer..." --weight=30
+ynh_script_progression --message="Executing Netdata installer..." --weight=10
 
 # create a temporary file for the log
 tmp=$(mktemp /tmp/netdata-updater-log-XXXXXX.log)
@@ -49,15 +51,6 @@ exec 3<&-
 # Specific configuration
 configure_netdata
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
-
-yunohost service add $app --description "Real-time performance and health monitoring for systems and applications" --log "$install_dir/var/log/netdata/error.log" "$install_dir/var/log/netdata/access.log" "$install_dir/var/log/netdata/debug.log"
-
 #=================================================
 # START SYSTEMD SERVICE
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index a09c169..39a8dac 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -60,18 +60,11 @@ configure_netdata
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1
+ynh_script_progression --message="Upgrading system configurations related to $app..." --weight=1
 
 # Create a dedicated NGINX config
 ynh_add_nginx_config
 
-#=================================================
-# GENERIC FINALIZATION
-#=================================================
-# INTEGRATE SERVICE IN YUNOHOST
-#=================================================
-ynh_script_progression --message="Integrating service in YunoHost..."
-
 yunohost service add $app --description "Real-time performance and health monitoring for systems and applications" --log "$install_dir/var/log/netdata/error.log" "$install_dir/var/log/netdata/access.log" "$install_dir/var/log/netdata/debug.log"
 
 #=================================================