From be82826d9d98dd7d8594effd903beb5b79a236b3 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 14 Apr 2022 15:52:09 +0200
Subject: [PATCH] Fix

---
 check_process   |  3 +--
 manifest.json   | 12 ------------
 scripts/install |  3 ---
 scripts/upgrade |  4 ++--
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/check_process b/check_process
index 5091332..9f8650a 100644
--- a/check_process
+++ b/check_process
@@ -6,7 +6,6 @@
 		language="fr"
 		admin="john"
 		password="1Strong-Password"
-		port="666"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1
@@ -15,7 +14,7 @@
 		setup_private=1
 		setup_public=1
 		upgrade=1
-		upgrade=1	from_commit=CommitHash
+		#upgrade=1	from_commit=CommitHash
 		backup_restore=1
 		multi_instance=1
 		change_url=1
diff --git a/manifest.json b/manifest.json
index 5c10115..36221b3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -39,18 +39,6 @@
                 "name": "is_public",
                 "type": "boolean",
                 "default": true
-            },
-            {
-                "name": "admin",
-                "type": "user"
-            },
-            {
-                "name": "password",
-                "type": "password",
-                "help": {
-                    "en": "Use the help field to add an information for the admin about this question.",
-                    "fr": "Utilisez le champ aide pour ajouter une information à l'intention de l'administrateur à propos de cette question."
-                }
             }
         ]
     }
diff --git a/scripts/install b/scripts/install
index 93d7cf0..d260611 100755
--- a/scripts/install
+++ b/scripts/install
@@ -27,8 +27,6 @@ ynh_abort_if_errors
 domain=$YNH_APP_ARG_DOMAIN
 path_url="/"
 is_public=$YNH_APP_ARG_IS_PUBLIC
-admin=$YNH_APP_ARG_ADMIN
-password=$YNH_APP_ARG_PASSWORD
 key=$(ynh_string_random --length=64)
 
 app=$YNH_APP_INSTANCE_NAME
@@ -52,7 +50,6 @@ ynh_script_progression --message="Storing installation settings..." --weight=1
 
 ynh_app_setting_set --app=$app --key=domain --value=$domain
 ynh_app_setting_set --app=$app --key=path --value=$path_url
-ynh_app_setting_set --app=$app --key=admin --value=$admin
 
 #=================================================
 # STANDARD MODIFICATIONS
diff --git a/scripts/upgrade b/scripts/upgrade
index 5900891..4b4a8c5 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -18,7 +18,6 @@ app=$YNH_APP_INSTANCE_NAME
 
 domain=$(ynh_app_setting_get --app=$app --key=domain)
 path_url=$(ynh_app_setting_get --app=$app --key=path)
-admin=$(ynh_app_setting_get --app=$app --key=admin)
 final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 
 #=================================================
@@ -67,7 +66,7 @@ then
 	ynh_script_progression --message="Upgrading source files..." --time --weight=1
 
 	# Download, check integrity, uncompress and patch the source from app.src
-	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/save/conf/default.conf"
+	ynh_setup_source --dest_dir="$final_path" --keep="$final_path/save/conf/default.json"
 fi
 
 chmod 750 "$final_path"
@@ -88,6 +87,7 @@ ynh_add_nginx_config
 ynh_script_progression --message="Upgrading dependencies..." --time --weight=1
 
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
+ynh_install_app_dependencies $pkg_dependencies
 
 #=================================================
 # SETUP SYSTEMD