From c96423cb8849a280eb839ee73e4926022363b11e Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 21 Jul 2021 14:25:01 +0200
Subject: [PATCH] Fix

---
 check_process      |  2 --
 manifest.json      | 62 +++++++++++++++++++++++-----------------------
 scripts/_common.sh | 12 +++++++--
 scripts/upgrade    |  8 +++---
 4 files changed, 45 insertions(+), 39 deletions(-)

diff --git a/check_process b/check_process
index 7d3022c..4fcb5d6 100644
--- a/check_process
+++ b/check_process
@@ -14,8 +14,6 @@
 		upgrade=1
 		backup_restore=1
 		multi_instance=0
-		incorrect_path=0
-		port_already_use=0
 		change_url=0
 ;;; Options
 Email=
diff --git a/manifest.json b/manifest.json
index 0282c73..c454be7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -23,37 +23,37 @@
     ],
     "arguments": {
         "install" : [
-    {
-        "name": "domain",
-        "type": "domain",
-        "example": "domain.org"
-    },
-    {
-        "name": "path",
-        "type": "path",
-        "example": "/jappix",
-        "default": "/jappix"
-    },
-    {
-        "name": "name",
-        "type": "string",
-        "ask": {
-            "en": "Choose a name for Jappix",
-            "fr": "Choisissez un nom pour Jappix"
-    },
-        "example": "YunoJappix",
-        "default": "YunoJappix"
-    },
-    {
-        "name": "language",
-        "type": "string",
-        "ask": {
-            "en": "Choose the default language of Jappix",
-            "fr": "Choissisez la langue par défaut de Jappix"
-    },
-        "choices" : ["en", "fr", "es"],
-        "default" : "en"
-    }
+        {
+            "name": "domain",
+            "type": "domain",
+            "example": "domain.org"
+        },
+        {
+            "name": "path",
+            "type": "path",
+            "example": "/jappix",
+            "default": "/jappix"
+        },
+        {
+            "name": "name",
+            "type": "string",
+            "ask": {
+                "en": "Choose a name for Jappix",
+                "fr": "Choisissez un nom pour Jappix"
+        },
+            "example": "YunoJappix",
+            "default": "YunoJappix"
+        },
+        {
+            "name": "language",
+            "type": "string",
+            "ask": {
+                "en": "Choose the default language of Jappix",
+                "fr": "Choissisez la langue par défaut de Jappix"
+        },
+            "choices" : ["en", "fr", "es"],
+            "default" : "en"
+        }
     ]
   }
 }
diff --git a/scripts/_common.sh b/scripts/_common.sh
index d32bc47..944a65e 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -1,9 +1,17 @@
 #!/bin/bash
 
 #=================================================
-# SETUP
+# COMMON VARIABLES
 #=================================================
 
 #=================================================
-# FUTUR YNH HELPERS
+# PERSONAL HELPERS
+#=================================================
+
+#=================================================
+# EXPERIMENTAL HELPERS
+#=================================================
+
+#=================================================
+# FUTURE OFFICIAL HELPERS
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index fc7d9f5..e78987a 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -19,10 +19,10 @@ ynh_script_progression --message="Loading installation settings..." --weight=1
 app=$YNH_APP_INSTANCE_NAME
 
 # Récupère les infos de l'application.
-domain=$(ynh_app_setting_get $app domain)
-path=$(ynh_app_setting_get $app path)
-name=$(ynh_app_setting_get "$app" name)
-language=$(ynh_app_setting_get "$app" language)
+domain=$(ynh_app_setting_get --app=$app --key=domain)
+path=$(ynh_app_setting_get --app=$app --key=path)
+name=$(ynh_app_setting_get --app=$app --key=name)
+language=$(ynh_app_setting_get --app=$app --key=language)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================