From f95b4a09d09df9871ebd0211709296a6055529d8 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 10:59:18 +0200
Subject: [PATCH] Update install

---
 scripts/install | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/scripts/install b/scripts/install
index bd733c2..1c24fc7 100644
--- a/scripts/install
+++ b/scripts/install
@@ -125,22 +125,26 @@ chown -R $app:www-data "$final_path"
 #=================================================
 ynh_script_progression --message="Configuring the $app..." --weight=2
 
-setup="{
-        \"url\": \"https://${domain}${path_url}\",
-        \"admin:username\": \"$admin\",
-        \"admin:password\": \"$password\",
-        \"admin:password:confirm\": \"$password\",
-        \"admin:email\": \"admin@$domain\",
-        \"database\": \"postgres\",
-        \"postgres:host\": \"localhost\",
-        \"postgres:port\": \"5432\",
-        \"postgres:username\": \"$db_name\",
-        \"postgres:password\": \"$db_pwd\",
-        \"postgres:database\": \"$db_name\"
-    }"
+# setup="{
+#         \"url\": \"https://${domain}${path_url}\",
+#         \"admin:username\": \"$admin\",
+#         \"admin:password\": \"$password\",
+#         \"admin:password:confirm\": \"$password\",
+#         \"admin:email\": \"admin@$domain\",
+#         \"database\": \"postgres\",
+#         \"postgres:host\": \"localhost\",
+#         \"postgres:port\": \"5432\",
+#         \"postgres:username\": \"$db_name\",
+#         \"postgres:password\": \"$db_pwd\",
+#         \"postgres:database\": \"$db_name\"
+#     }"
+
+# pushd $final_path
+#     ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
+# popd
 
 pushd $final_path
-    ynh_exec_as $app $ynh_node_load_PATH $final_path/nodebb setup "${setup}" | tee -a $install_log
+    ynh_exec_as $app $ynh_node_load_PATH admin__password=$password node app --setup | tee -a $install_log
 popd
 
 #=================================================