From 41121d761210c9aa05c232c3809c5dd0ce6f73b9 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sat, 15 May 2021 18:17:31 +0200
Subject: [PATCH] Fix

---
 scripts/install | 21 +++++++++++----------
 scripts/upgrade |  2 +-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/scripts/install b/scripts/install
index 49f3079..8954a19 100755
--- a/scripts/install
+++ b/scripts/install
@@ -83,6 +83,14 @@ ynh_app_setting_set --app=$app --key=db_name --value=$db_name
 ynh_psql_test_if_first_run
 ynh_psql_setup_db --db_user=$db_name --db_name=$db_name
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Configuring system user..." --weight=2
+
+# Create a system user
+ynh_system_user_create --username=$app
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -113,23 +121,15 @@ ynh_setup_source --dest_dir="$final_path"
 #=================================================
 # NGINX CONFIGURATION
 #=================================================
-ynh_script_progression --message="Configuring NGINX web server..."
+ynh_script_progression --message="Configuring NGINX web server..." --weight=3
 
 # Create a dedicated nginx config
 ynh_add_nginx_config
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Configuring system user..."
-
-# Create a system user
-ynh_system_user_create --username=$app
-
 #=================================================
 # SETUP SYSTEMD
 #=================================================
-ynh_script_progression --message="Configuring a systemd service..."
+ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
 # Create a dedicated systemd config
 ynh_add_systemd_config
@@ -143,6 +143,7 @@ ynh_add_config --template="../conf/default.yml" --destination="$final_path/.conf
 #=================================================
 # INSTALLING MISKKEY
 #=================================================
+ynh_script_progression --message="Installing Misskey..." --weight=15
 
 pushd "$final_path"
 	ynh_exec_warn_less yarn add ts-node webpack
diff --git a/scripts/upgrade b/scripts/upgrade
index 0d1fc9a..493b0da 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -84,7 +84,7 @@ then
 	ynh_script_progression --message="Upgrading source files..."
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	#ynh_setup_source --dest_dir="$final_path"
+	ynh_setup_source --dest_dir="$final_path"
 fi
 
 #=================================================