direct execrule for nodejs, which is now also installed

small fix for start/stop pid of node-red

Makefile

@@ -38,6 +38,9 @@ install:
 	cp -ra build/mysql/* ${DESTDIR}${PREFIX}/mysql
 	install -d ${DESTDIR}${PREFIX}/node-red
 	cp -ra build/node-red/* ${DESTDIR}${PREFIX}/node-red
+	install -d ${DESTDIR}${PREFIX}/nodejs
+	cp -ra build/nodejs/* ${DESTDIR}${PREFIX}/nodejs
+
 	make -C src     install
 	make -C zlibs   install
 	make -C daemons install

daemons/node-red

@@ -220,7 +220,9 @@ node-red-exec() {
 	fn node-red-exec $*
 
 	# TODO: eliminate version from path
-	path+=($R/build/nodejs/node-v6.10.3-linux-x64/bin)
-	launch node-red -s $conf $* &
+	path+=($R/nodejs/node_dir/bin)
+	launch nodejs $R/node-red/red.js -s $conf $* &
+	# TODO: here we save the pid + 1 but it may not work everywhere
+	print $(( $! + 1 )) > $H/run/node-red.pid
 	savepid node-red $H/run/node-red.pid
 }

src/config.sh

@@ -111,7 +111,7 @@ execrules=(
 	mysqld       user
 	mysql        user
 	hiredis-lock user
-	node-red     user
+	nodejs       user
 
 	# springs
 	dowse-to-mqtt  user
@@ -154,7 +154,7 @@ execmap=(
 	omshell       $PREFIX/bin/omshell
 	mysqld        $PREFIX/mysql/bin/mysqld
 	mysql         $PREFIX/mysql/bin/mysql
-	node-red      $PREFIX/node-red/red.js
+	nodejs        $PREFIX/nodejs/node_dir/bin/node
 
 	dowse-to-mqtt  $PREFIX/bin/dowse-to-mqtt
 	dowse-to-osc   $PREFIX/bin/dowse-to-osc

src/import.sh

@@ -110,22 +110,27 @@ case `uname -m` in
 esac
 
 [[ "$1" = "node-red" ]] && {
+	node_dist="node-v6.10.3-linux-x64"
 	notice "Import nodejs and npm for node-red dashboard"
 	mkdir -p $S/build/nodejs
 	pushd $S/build/nodejs
 	case $CPU in
 		x64)
-			[[ -r node-v6.10.3-linux-x64.tar.xz ]] ||
-				curl https://nodejs.org/dist/v6.10.3/node-v6.10.3-linux-x64.tar.xz -o node-v6.10.3-linux-x64.tar.xz
-			[[ -d node-v6.10.3-linux-x64 ]] ||
-				tar xvf node-v6.10.3-linux-x64.tar.xz
+			[[ -r ${node_dist}.tar.xz ]] ||
+				curl https://nodejs.org/dist/v6.10.3/${node_dist}.tar.xz \
+					 -o ${node_dist}.tar.xz
+			[[ -d ${node_dist} ]] || {
+				tar xf ${node_dist}.tar.xz
+				rm -rf node_dir
+				mv ${node_dist} node_dir
+			}
 			;;
 		*)
 			error "Unknown machine architecture for nodejs"
 			;;
 	esac
 	popd
-	path+=($S/build/nodejs/node-v6.10.3-linux-x64/bin)
+	path+=($S/build/nodejs/node_dir/bin)
 	rehash
 	[[ -r $S/build/node-red/README.md ]] || {
 		act "copying node-red source to build location"