Merge pull request #3 from laconbass/master

Fix smaugd-wsproxy for systems where 'nodejs' is 'node'.
smaugmuds · Dec 6, 2016 · efd538c · efd538c
2 parents bf798fa + 3a52dc9
commit efd538c
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/etc/init.d/smaugd-wsproxy.in b/etc/init.d/smaugd-wsproxy.in
@@ -44,16 +44,20 @@ source @sysconfdir@/@PACKAGE@/@[email protected]
 true=0;
 false=1;
 
+# dirty fix for systems having "node" instead "nodejs" as executable name
+NODEJS="$($SU $USER -c 'command -v nodejs || command -v node')"
+test $($NODEJS -v) == "v4.6.1" || { echo "$NODEJS -v mismatch"; exit $false; }
+
 test -f "$PROXY_DIR/wsproxy.js" || exit $false;
 
 set -e;
 
 start_daemon() {
 	if test ! -f "$PROXY_PIDFILE"; then
-		($SU $USER -c "nodejs $PROXY_DIR/wsproxy.js" &>>$PROXY_LOGFILE &) &
+		($SU $USER -c "$NODEJS $PROXY_DIR/wsproxy.js" &>>$PROXY_LOGFILE &) &
 	fi;
 
-	until	pidof nodejs > $PROXY_PIDFILE; do
+	until	pidof $NODEJS > $PROXY_PIDFILE; do
 		sleep 2;
 	done;