From 14e95aa67c4b840f6b6139710f64bce9abec3b29 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 2 Sep 2021 09:22:31 +0200
Subject: [PATCH] Update install

---
 scripts/install | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/scripts/install b/scripts/install
index 85b9741..7ff40ed 100644
--- a/scripts/install
+++ b/scripts/install
@@ -133,12 +133,14 @@ setup="{
         \"database\": \"postgres\",
         \"postgres:host\": \"localhost\",
         \"postgres:port\": \"5432\",
-        \"postgres:username\": \"${db_name}\",
-        \"postgres:password\": \"${db_pwd}\",
-        \"postgres:database\": \"${db_name}\"
+        \"postgres:username\": \"$db_name\",
+        \"postgres:password\": \"$db_pwd\",
+        \"postgres:database\": \"$db_name\"
     }"
 
-ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}"
+pushd $final_path
+    ynh_exec_as $app env $ynh_node_load_PATH $final_path/nodebb setup "${setup}"
+popd
 
 #=================================================
 # NGINX CONFIGURATION
@@ -162,7 +164,7 @@ ynh_add_systemd_config
 #=================================================
 ynh_script_progression --message="Integrating service in YunoHost..." --weight=1
 
-yunohost service add $app --description="Forum software" --log="/var/log/$app/$app.log"
+yunohost service add $app --description="Nodejs Forum" --log="/var/log/$app/$app.log"
 
 #=================================================
 # START ETHERPAD IN BACKGROUND
@@ -179,7 +181,7 @@ ynh_script_progression --message="Configuring permissions..." --weight=1
 # Make app public if necessary
 if [ $is_public -eq 1 ]
 then
-	ynh_permission_update --permission="main" --add="visitors"
+    ynh_permission_update --permission="main" --add="visitors"
 fi
 
 ynh_permission_create --permission="api" --url="/api" --allowed="visitors" --show_tile="false" --protected="true"