From bfcbcc8a7aeb4040af7eec00f96e329a70f11849 Mon Sep 17 00:00:00 2001
From: Rafi594 <rafi59_dev@srvmaison.fr.nf>
Date: Sat, 26 Oct 2019 20:08:23 +0200
Subject: [PATCH] Fixes

---
 check_process      | 2 +-
 manifest.json      | 2 +-
 scripts/change_url | 1 +
 scripts/upgrade    | 5 +++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/check_process b/check_process
index ea5f645..78a3fb3 100644
--- a/check_process
+++ b/check_process
@@ -20,7 +20,7 @@
 		upgrade=1
 		upgrade=1 	from_commit=7a4ce3de66d44b45ea08e8feb07b925a821ec760
 		backup_restore=1
-		multi_instance=1
+		multi_instance=0
 		incorrect_path=1
 		port_already_use=1
 		change_url=1
diff --git a/manifest.json b/manifest.json
index edd3c21..8979002 100644
--- a/manifest.json
+++ b/manifest.json
@@ -21,7 +21,7 @@
     "requirements": {
         "yunohost": ">= 3.5"
     },
-    "multi_instance": true,
+    "multi_instance": false,
     "services": [
         "nginx",
         "mysql"
diff --git a/scripts/change_url b/scripts/change_url
index 2cae48c..0965c93 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -28,6 +28,7 @@ ynh_script_progression --message="Loading installation settings..." --time --wei
 
 # Needed for helper "ynh_add_nginx_config"
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
+port=$(ynh_app_setting_get --app=$app --key=port)
 
 # Add settings here as needed by your application
 #db_name=$(ynh_app_setting_get --app=$app --key=db_name)
diff --git a/scripts/upgrade b/scripts/upgrade
index 6eea9ec..773c505 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -20,6 +20,7 @@ domain=$(ynh_app_setting_get $app domain)
 path_url=$(ynh_app_setting_get $app path)
 is_public=$(ynh_app_setting_get $app is_public)
 final_path=$(ynh_app_setting_get $app final_path)
+config_path=$(ynh_app_setting_get $app config_path)
 port=$(ynh_app_setting_get $app port)
 
 #=================================================
@@ -56,8 +57,8 @@ fi
 
 # If config_path doesn't exist, create it
 if [ -z "$config_path" ]; then
-	final_path=/home/yunohost.app/$app
-	ynh_app_setting_set --app=$app --key=final_path --value=$config_path
+	config_path=/home/yunohost.app/$app
+	ynh_app_setting_set --app=$app --key=config_path --value=$config_path
 fi