From 8e119b97f2bb207b2dc10b204c1d7fea0783f7ec Mon Sep 17 00:00:00 2001
From: tituspijean <tituspijean@outlook.com>
Date: Tue, 25 May 2021 10:41:05 +0200
Subject: [PATCH] Fix NodeJS usage

---
 conf/systemd.service | 4 ++--
 scripts/install      | 7 ++++---
 scripts/upgrade      | 7 ++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/conf/systemd.service b/conf/systemd.service
index 0d2442f..8d43466 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -7,8 +7,8 @@ Type=simple
 User=__APP__
 Group=__APP__
 WorkingDirectory=__FINALPATH__/
-Environment=NODE_ENV=production
-ExecStart=__NODEJS_PATH__/node red.js -p __PORT__ -u __FINALPATH__/data
+Environment="__YNH_NODE_LOAD_PATH__"
+ExecStart=__YNH_NODE__ red.js -p __PORT__ -u __FINALPATH__/data
 StandardOutput=append:/var/log/__APP__/__APP__.log
 StandardError=inherit
 
diff --git a/scripts/install b/scripts/install
index 5f2a0b1..0802901 100755
--- a/scripts/install
+++ b/scripts/install
@@ -95,10 +95,11 @@ ynh_script_progression --message="Installing Node-RED..." --weight=2
 
 chown -R $app: $final_path
 
+ynh_use_nodejs
+
 pushd $final_path
-	ynh_use_nodejs
-	ynh_exec_warn_less exec_as $app env PATH=$PATH npm install --production
-	ynh_exec_warn_less exec_as $app env PATH=$PATH npm install node-red-dashboard
+	ynh_exec_warn_less exec_as $app $ynh_node_load_PATH $ynh_npm install --production
+	ynh_exec_warn_less exec_as $app $ynh_node_load_PATH $ynh_npm install node-red-dashboard
 popd
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 6cf821b..35813c2 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -128,10 +128,11 @@ ynh_script_progression --message="Installing Node-RED..." --weight=30
 chown -R root:root $final_path
 chown -R $app: $final_path/data
 
+ynh_use_nodejs
+
 pushd $final_path
-	ynh_use_nodejs
-	ynh_exec_warn_less exec_as $app env PATH=$PATH npm install --production
-	ynh_exec_warn_less exec_as $app env PATH=$PATH npm install node-red-dashboard
+        ynh_exec_warn_less exec_as $app $ynh_node_load_PATH $ynh_npm install --production
+        ynh_exec_warn_less exec_as $app $ynh_node_load_PATH $ynh_npm install node-red-dashboard
 popd
 
 #=================================================