From ccfe6ec54051e7b7e5a580f6a13fde0d042d1678 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 12 Jul 2022 09:55:00 +0200
Subject: [PATCH] cleaning (#77) (#78)

---
 scripts/install | 6 +++---
 scripts/upgrade | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/install b/scripts/install
index b31def0..4548150 100644
--- a/scripts/install
+++ b/scripts/install
@@ -100,6 +100,7 @@ ynh_setup_source --dest_dir=$final_path
 chmod 750 "$final_path"
 chmod -R o-rwx "$final_path"
 chown -R $app:www-data "$final_path"
+chmod +x $final_path/app.js
 
 #=================================================
 # NGINX CONFIGURATION
@@ -118,8 +119,8 @@ ynh_script_progression --message="Building CodiMD... (this will take some time a
 
 pushd $final_path
 	ynh_use_nodejs
-	ynh_exec_as $app env $ynh_node_load_PATH bin/setup
-	ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm run build
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/setup
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm run build
 popd
 
 #=================================================
@@ -132,7 +133,6 @@ ynh_add_config --template="../conf/.sequelizerc.example" --destination="$final_p
 
 chmod 600 $final_path/config.json
 chmod 600 $final_path/.sequelizerc
-chmod +x $final_path/app.js
 
 #=================================================
 # SETUP SYSTEMD
diff --git a/scripts/upgrade b/scripts/upgrade
index 186b2b7..17b9905 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -136,8 +136,10 @@ then
 
 	pushd "$final_path"
 		ynh_use_nodejs
-		ynh_exec_warn_less bin/setup
-		ynh_exec_warn_less $ynh_npm run build
+		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/setup
+		ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm run build
+		#ynh_exec_warn_less ynh_exec_warn_less bin/setup
+		#ynh_exec_warn_less ynh_exec_warn_less $ynh_npm run build
 	popd
 fi