From 5ec8147eb12cfb8b897b5dd632f259869caa6040 Mon Sep 17 00:00:00 2001
From: Dave C-J <dave@conway-jones.co.uk>
Date: Fri, 25 Oct 2013 18:22:45 +0100
Subject: [PATCH] Use environment variable to set path for nodes....

---
 hardware/Pi/37-rpi-piface.html |  14 +--
 hardware/Pi/37-rpi-piface.js   | 192 ++++++++++++++++-----------------
 hardware/Pi/78-ledborg.html    |   8 +-
 hardware/Pi/78-ledborg.js      |  50 ++++-----
 io/ping/88-ping.js             |  64 +++++------
 time/79-suncalc.js             |   3 +-
 6 files changed, 166 insertions(+), 165 deletions(-)

diff --git a/hardware/Pi/37-rpi-piface.html b/hardware/Pi/37-rpi-piface.html
index 3e3ac043..36e91117 100644
--- a/hardware/Pi/37-rpi-piface.html
+++ b/hardware/Pi/37-rpi-piface.html
@@ -52,10 +52,10 @@
 </script>
 
 <script type="text/x-red" data-help-name="rpi-piface in">
-	<p>Raspberry Pi PiFace input node. Generates a <b>msg.payload</b> with either a 0 or 1 depending on the state of the input pin. Requires the gpio command to work.</p>
-	<p>You may also enable the input pullup resitor if required.</p>
-	<p>The <b>msg.topic</b> is set to <i>pi/{the pin number}</i></p>
-	<p><b>Note:</b> This node currently polls the pin every 250mS. This is not ideal as it loads the cpu, and will be rewritten shortly to try to use interrupts.</p>
+    <p>Raspberry Pi PiFace input node. Generates a <b>msg.payload</b> with either a 0 or 1 depending on the state of the input pin. Requires the gpio command to work.</p>
+    <p>You may also enable the input pullup resitor if required.</p>
+    <p>The <b>msg.topic</b> is set to <i>pi/{the pin number}</i></p>
+    <p><b>Note:</b> This node currently polls the pin every 250mS. This is not ideal as it loads the cpu, and will be rewritten shortly to try to use interrupts.</p>
 </script>
 
 <script type="text/javascript">
@@ -103,9 +103,9 @@
 </script>
 
 <script type="text/x-red" data-help-name="rpi-piface out">
-	<p>Raspberry Pi PiFace output node. The PiFace board must be fitted. Requires the gpio command to work.</p>
-	<p>Expects a <b>msg.payload</b> with either a 0 or 1 (or true or false).</p>
-	<p>Will set the selected relay, LED, or pin on or off depending on the value passed in.</p>
+    <p>Raspberry Pi PiFace output node. The PiFace board must be fitted. Requires the gpio command to work.</p>
+    <p>Expects a <b>msg.payload</b> with either a 0 or 1 (or true or false).</p>
+    <p>Will set the selected relay, LED, or pin on or off depending on the value passed in.</p>
 </script>
 
 <script type="text/javascript">
diff --git a/hardware/Pi/37-rpi-piface.js b/hardware/Pi/37-rpi-piface.js
index 0d692efd..67bb2ac2 100644
--- a/hardware/Pi/37-rpi-piface.js
+++ b/hardware/Pi/37-rpi-piface.js
@@ -14,121 +14,121 @@
  * limitations under the License.
  **/
 
-var RED = require("../../red/red");
+var RED = require(process.env.NODE_RED_HOME+"/red/red");
 var util = require("util");
 var exec = require('child_process').exec;
 var fs =  require('fs');
 
 if (!fs.existsSync("/usr/local/bin/gpio")) {
-	exec("cat /proc/cpuinfo | grep BCM27",function(err,stdout,stderr) {
-		if (stdout.indexOf('BCM27') > -1) {
-			util.log('[37-rpi-piface.js] Error: Cannot find Wiring-Pi "gpio" command');
-		}
-		// else not on a Pi so don't worry anyone with needless messages.
-	});
-	return;
+    exec("cat /proc/cpuinfo | grep BCM27",function(err,stdout,stderr) {
+        if (stdout.indexOf('BCM27') > -1) {
+            util.log('[37-rpi-piface.js] Error: Cannot find Wiring-Pi "gpio" command');
+        }
+        // else not on a Pi so don't worry anyone with needless messages.
+    });
+    return;
 }
 
 // Map names of pins to Gordon's gpio PiFace pin numbers
 var pintable = {
 // Physical : WiringPi
-		"Button S1":"200",
-		"Button S2":"201",
-		"Button S3":"202",
-		"Button S4":"203",
-		"Input 5":"204",
-		"Input 6":"205",
-		"Input 7":"206",
-		"Input 8":"207",
-		"Output0":"208",
-		"Output1":"209",
-		"Output2":"210",
-		"Output3":"211",
-		"Output4":"212",
-		"Output5":"213",
-		"Output6":"214",
-		"Output7":"215",
-		"LED 0 / Relay 0":"200",
-		"LED 1 / Relay 1":"201",
-		"LED 2":"202",
-		"LED 3":"203",
-		"LED 4":"204",
-		"LED 5":"205",
-		"LED 6":"206",
-		"LED 7":"207"
+        "Button S1":"200",
+        "Button S2":"201",
+        "Button S3":"202",
+        "Button S4":"203",
+        "Input 5":"204",
+        "Input 6":"205",
+        "Input 7":"206",
+        "Input 8":"207",
+        "Output0":"208",
+        "Output1":"209",
+        "Output2":"210",
+        "Output3":"211",
+        "Output4":"212",
+        "Output5":"213",
+        "Output6":"214",
+        "Output7":"215",
+        "LED 0 / Relay 0":"200",
+        "LED 1 / Relay 1":"201",
+        "LED 2":"202",
+        "LED 3":"203",
+        "LED 4":"204",
+        "LED 5":"205",
+        "LED 6":"206",
+        "LED 7":"207"
 }
 
 function PiFACEInNode(n) {
-	RED.nodes.createNode(this,n);
-	this.buttonState = -1;
-	this.pin = pintable[n.pin];
-	this.intype = n.intype;
-	var node = this;
-	if (node.pin) {
-		exec("gpio -p mode "+node.pin+" "+node.intype, function(err,stdout,stderr) {
-			if (err) node.error(err);
-			else {
-				node._interval = setInterval( function() {
-					exec("gpio -p read "+node.pin, function(err,stdout,stderr) {
-						if (err) node.error(err);
-						else {
-							if (node.buttonState !== Number(stdout)) {
-								var previousState = node.buttonState;
-								node.buttonState = Number(stdout);
-								if (previousState !== -1) {
-									var msg = {topic:"pi/"+node.pin, payload:node.buttonState};
-									node.send(msg);
-								}
-							}
-						}
-					});
-				}, 250);
-			}
-		});
-	}
-	else {
-		node.error("Invalid PiFACE pin: "+node.pin);
-	}
+    RED.nodes.createNode(this,n);
+    this.buttonState = -1;
+    this.pin = pintable[n.pin];
+    this.intype = n.intype;
+    var node = this;
+    if (node.pin) {
+        exec("gpio -p mode "+node.pin+" "+node.intype, function(err,stdout,stderr) {
+            if (err) node.error(err);
+            else {
+                node._interval = setInterval( function() {
+                    exec("gpio -p read "+node.pin, function(err,stdout,stderr) {
+                        if (err) node.error(err);
+                        else {
+                            if (node.buttonState !== Number(stdout)) {
+                                var previousState = node.buttonState;
+                                node.buttonState = Number(stdout);
+                                if (previousState !== -1) {
+                                    var msg = {topic:"pi/"+node.pin, payload:node.buttonState};
+                                    node.send(msg);
+                                }
+                            }
+                        }
+                    });
+                }, 250);
+            }
+        });
+    }
+    else {
+        node.error("Invalid PiFACE pin: "+node.pin);
+    }
 }
 
 function PiFACEOutNode(n) {
-	RED.nodes.createNode(this,n);
-	this.pin = pintable[n.pin];
-	var node = this;
-	if (node.pin) {
-		node.on("input", function(msg) {
-			if (msg.payload === "true") msg.payload = true;
-			if (msg.payload === "false") msg.payload = false;
-			var out = Number(msg.payload);
-			if ((out == 0)|(out == 1)) {
-				exec("gpio -p write "+node.pin+" "+out, function(err,stdout,stderr) {
-					if (err) node.error(err);
-				});
-			}
-			else node.warn("Invalid input - not 0 or 1");
-		});
-	}
-	else {
-		node.error("Invalid PiFACE pin: "+node.pin);
-	}
+    RED.nodes.createNode(this,n);
+    this.pin = pintable[n.pin];
+    var node = this;
+    if (node.pin) {
+        node.on("input", function(msg) {
+            if (msg.payload === "true") msg.payload = true;
+            if (msg.payload === "false") msg.payload = false;
+            var out = Number(msg.payload);
+            if ((out == 0)|(out == 1)) {
+                exec("gpio -p write "+node.pin+" "+out, function(err,stdout,stderr) {
+                    if (err) node.error(err);
+                });
+            }
+            else node.warn("Invalid input - not 0 or 1");
+        });
+    }
+    else {
+        node.error("Invalid PiFACE pin: "+node.pin);
+    }
 }
 
 
 
 exec("gpio load spi",function(err,stdout,stderr) {
-	if (err) {
-		util.log('[37-rpi-piface.js] Error: "gpio load spi" command failed for some reason.');
-	}
-	exec("gpio -p reset",function(err,stdout,stderr) {
-		if (err) {
-			util.log('[37-rpi-piface.js] Error: "gpio -p reset" command failed for some reason.');
-		}
-		RED.nodes.registerType("rpi-piface in",PiFACEInNode);
-		RED.nodes.registerType("rpi-piface out",PiFACEOutNode);
-		PiFACEInNode.prototype.close = function() {
-			clearInterval(this._interval);
-		}
-		PiFACEOutNode.prototype.close = function() {
-		}
-	});
+    if (err) {
+        util.log('[37-rpi-piface.js] Error: "gpio load spi" command failed for some reason.');
+    }
+    exec("gpio -p reset",function(err,stdout,stderr) {
+        if (err) {
+            util.log('[37-rpi-piface.js] Error: "gpio -p reset" command failed for some reason.');
+        }
+        RED.nodes.registerType("rpi-piface in",PiFACEInNode);
+        RED.nodes.registerType("rpi-piface out",PiFACEOutNode);
+        PiFACEInNode.prototype.close = function() {
+            clearInterval(this._interval);
+        }
+        PiFACEOutNode.prototype.close = function() {
+        }
+    });
 });
diff --git a/hardware/Pi/78-ledborg.html b/hardware/Pi/78-ledborg.html
index e97da1b0..0fefa704 100644
--- a/hardware/Pi/78-ledborg.html
+++ b/hardware/Pi/78-ledborg.html
@@ -23,10 +23,10 @@
 </script>
 
 <script type="text/x-red" data-help-name="ledborg">
-	<p>PiBorg LedBorg LED output node. Expects a <b>msg.payload</b> with a three digit rgb triple, from <b>000</b> to <b>222</b>.</p>
-	<p>See <i><a href="http://www.piborg.com/ledborg/install" target="_new">the PiBorg site</a></i> for more information.</p>
-	<p>You can also now use a <b>msg.payload</b> in the standard hex format "#rrggbb". The clip levels are :</p>
-	<p><pre>0x00 - 0x57 = off<br/>0x58 - 0xA7 = 50%<br/>0xA8 - 0xFF = fully on</pre></p>
+    <p>PiBorg LedBorg LED output node. Expects a <b>msg.payload</b> with a three digit rgb triple, from <b>000</b> to <b>222</b>.</p>
+    <p>See <i><a href="http://www.piborg.com/ledborg/install" target="_new">the PiBorg site</a></i> for more information.</p>
+    <p>You can also now use a <b>msg.payload</b> in the standard hex format "#rrggbb". The clip levels are :</p>
+    <p><pre>0x00 - 0x57 = off<br/>0x58 - 0xA7 = 50%<br/>0xA8 - 0xFF = fully on</pre></p>
 </script>
 
 <script type="text/javascript">
diff --git a/hardware/Pi/78-ledborg.js b/hardware/Pi/78-ledborg.js
index 80f6e316..4c153d05 100644
--- a/hardware/Pi/78-ledborg.js
+++ b/hardware/Pi/78-ledborg.js
@@ -14,40 +14,40 @@
  * limitations under the License.
  **/
 
-var RED = require("../../red/red");
+var RED = require(process.env.NODE_RED_HOME+"/red/red");
 var util =  require('util');
 var fs =  require('fs');
 
 // check if /dev/ledborg exists - if not then don't even show the node.
 if (!fs.existsSync("/dev/ledborg")) {
-	util.log("[78-ledborg.js] Error: PiBorg hardware : LedBorg not found");
-	return;
+    util.log("[78-ledborg.js] Error: PiBorg hardware : LedBorg not found");
+    return;
 }
 
 function LedBorgNode(n) {
-	RED.nodes.createNode(this,n);
-	var p1 = /[0-2][0-2][0-2]/
-	var p2 = /^\#[A-Fa-f0-9]{6}$/
-	var node = this;
+    RED.nodes.createNode(this,n);
+    var p1 = /[0-2][0-2][0-2]/
+    var p2 = /^\#[A-Fa-f0-9]{6}$/
+    var node = this;
 
-	this.on("input", function(msg) {
-		if (p1.test(msg.payload)) {
-			fs.writeFile('/dev/ledborg', msg.payload, function (err) {
-				if (err) node.warn(msg.payload+" : No LedBorg found");
-			});
-		}
-		if (p2.test(msg.payload)) {
-			var r = Math.floor(parseInt(msg.payload.slice(1,3),16)/88).toString();
-			var g = Math.floor(parseInt(msg.payload.slice(3,5),16)/88).toString();
-			var b = Math.floor(parseInt(msg.payload.slice(5),16)/88).toString();
-			fs.writeFile('/dev/ledborg', r+g+b, function (err) {
-				if (err) node.warn(r+g+b+" : No LedBorg found");
-			});
-		}
-		else {
-			node.warn("Invalid LedBorg colour code");
-		}
-	});
+    this.on("input", function(msg) {
+        if (p1.test(msg.payload)) {
+            fs.writeFile('/dev/ledborg', msg.payload, function (err) {
+                if (err) node.warn(msg.payload+" : No LedBorg found");
+            });
+        }
+        if (p2.test(msg.payload)) {
+            var r = Math.floor(parseInt(msg.payload.slice(1,3),16)/88).toString();
+            var g = Math.floor(parseInt(msg.payload.slice(3,5),16)/88).toString();
+            var b = Math.floor(parseInt(msg.payload.slice(5),16)/88).toString();
+            fs.writeFile('/dev/ledborg', r+g+b, function (err) {
+                if (err) node.warn(r+g+b+" : No LedBorg found");
+            });
+        }
+        else {
+            node.warn("Invalid LedBorg colour code");
+        }
+    });
 }
 
 RED.nodes.registerType("ledborg",LedBorgNode);
diff --git a/io/ping/88-ping.js b/io/ping/88-ping.js
index be6740a6..72e875c0 100644
--- a/io/ping/88-ping.js
+++ b/io/ping/88-ping.js
@@ -13,45 +13,45 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-var RED = require("../../red/red");
+
+var RED = require(process.env.NODE_RED_HOME+"/red/red");
 var spawn = require('child_process').spawn;
 var plat = require('os').platform();
 
 function PingNode(n) {
-	RED.nodes.createNode(this,n);
-	this.host = n.host;
-	this.timer = n.timer * 1000;
-	var node = this;
+    RED.nodes.createNode(this,n);
+    this.host = n.host;
+    this.timer = n.timer * 1000;
+    var node = this;
 
-	node.tout = setInterval(function() {
-		var ex;
-		if (plat == "linux") ex = spawn('ping', ['-n', '-w 5', '-c 1', node.host]);
-		else if (plat.match(/^win/)) ex = spawn('ping', ['-n 1', '-w 5000', node.host]);
-		else if (plat == "darwin") ex = spawn('ping', ['-n', '-t 5', '-c 1', node.host]);
-		else node.error("Sorry - your platform - "+plat+" - is not recognised.");
-		var res="";
+    node.tout = setInterval(function() {
+        var ex;
+        if (plat == "linux") ex = spawn('ping', ['-n', '-w 5', '-c 1', node.host]);
+        else if (plat.match(/^win/)) ex = spawn('ping', ['-n 1', '-w 5000', node.host]);
+        else if (plat == "darwin") ex = spawn('ping', ['-n', '-t 5', '-c 1', node.host]);
+        else node.error("Sorry - your platform - "+plat+" - is not recognised.");
+        var res="";
+        ex.stdout.on('data', function (data) {
+            //console.log('[ping] stdout: ' + data.toString());
+            var regex = /time=(.*)ms/;
+            var m = regex.exec(data.toString())||[""];
+            res = Number(m[1]);
+        });
+        ex.stderr.on('data', function (data) {
+            //console.log('[ping] stderr: ' + data);
+        });
+        ex.on('close', function (code) {
+            //console.log('[ping] result: ' + code);
+            var msg = { payload: false, topic:node.host };
+            if (code == 0) msg = { payload: res, topic:node.host };
+            node.send(msg);
+        });
+    }, node.timer);
 
-		ex.stdout.on('data', function (data) {
-			//console.log('[ping] stdout: ' + data.toString());
-			var regex = /time=(.*)ms/;
-			var m = regex.exec(data.toString())||[""];
-			res = Number(m[1]);
-		});
-		ex.stderr.on('data', function (data) {
-			//console.log('[ping] stderr: ' + data);
-		});
-		ex.on('close', function (code) {
-			//console.log('[ping] result: ' + code);
-			var msg = { payload: false, topic:node.host };
-			if (code == 0) msg = { payload: res, topic:node.host };
-			node.send(msg);
-		});
+    this.on("close", function() {
+        clearInterval(this.tout);
+    });
 
-	}, node.timer);
 }
 
 RED.nodes.registerType("ping",PingNode);
-
-PingNode.prototype.close = function() {
-	clearInterval(this.tout);
-}
diff --git a/time/79-suncalc.js b/time/79-suncalc.js
index 383824a3..8004633d 100644
--- a/time/79-suncalc.js
+++ b/time/79-suncalc.js
@@ -13,7 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  **/
-var RED = require("../../red/red");
+
+var RED = require(process.env.NODE_RED_HOME+"/red/red");
 var SunCalc = require('suncalc');
 
 function SunNode(n) {