From 4c89e932d47cb1ecf2e2473b38a3871e6116238a Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Mon, 15 Nov 2021 07:27:00 +0100
Subject: [PATCH] fix

---
 scripts/backup  |  2 +-
 scripts/install |  2 +-
 scripts/upgrade | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/backup b/scripts/backup
index 2a2b65e..2d90ed5 100644
--- a/scripts/backup
+++ b/scripts/backup
@@ -25,7 +25,7 @@ app=$YNH_APP_INSTANCE_NAME
 
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 domain=$(ynh_app_setting_get --app=$app --key=domain)
-phpversion=$YNH_PHP_VERSION
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # DECLARE DATA AND CONF FILES TO BACKUP
diff --git a/scripts/install b/scripts/install
index 9acb875..2892a8a 100644
--- a/scripts/install
+++ b/scripts/install
@@ -90,7 +90,7 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=3
 
 # Create a dedicated PHP-FPM config
 ynh_add_fpm_config
-phpversion=$YNH_PHP_VERSION
+phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
 #=================================================
 # MODIFY A CONFIG FILE
diff --git a/scripts/upgrade b/scripts/upgrade
index 0651532..eeb7c19 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -60,6 +60,14 @@ if ynh_legacy_permissions_exists; then
 	ynh_app_setting_delete --app=$app --key=is_public
 fi
 
+#=================================================
+# CREATE DEDICATED USER
+#=================================================
+ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
+
+# Create a dedicated user (if not existing)
+ynh_system_user_create --username=$app --home_dir="$final_path"
+
 #=================================================
 # DOWNLOAD, CHECK AND UNPACK SOURCE
 #=================================================
@@ -91,14 +99,6 @@ ynh_script_progression --message="Upgrading dependencies..." --weight=1
 
 ynh_install_app_dependencies $pkg_dependencies
 
-#=================================================
-# CREATE DEDICATED USER
-#=================================================
-ynh_script_progression --message="Making sure dedicated system user exists..." --weight=1
-
-# Create a dedicated user (if not existing)
-ynh_system_user_create --username=$app
-
 #=================================================
 # PHP-FPM CONFIGURATION
 #=================================================