From 6f7487f393cdd3bc86370de76a4c663e0e1a90b2 Mon Sep 17 00:00:00 2001 From: Nicholas O'Leary Date: Wed, 30 Oct 2013 21:34:54 +0000 Subject: [PATCH] Use process.env.NODE_RED_HOME to locate modules --- analysis/wordpos/72-wordpos.js | 2 +- hardware/blink/76-blinkstick.js | 2 +- hardware/blink/77-blink1.js | 2 +- hardware/digiRGB/78-digiRGB.js | 2 +- hardware/scanBLE/101-scanBLE.js | 2 +- hardware/sensorTag/79-sensorTag.js | 2 +- social/notify/57-notify.js | 4 ++-- social/prowl/57-prowl.js | 4 ++-- social/pushbullet/57-pushbullet.js | 4 ++-- social/xmpp/92-xmpp.js | 4 ++-- storage/leveldb/67-leveldb.js | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/analysis/wordpos/72-wordpos.js b/analysis/wordpos/72-wordpos.js index 0725cb1e..ca6739b9 100644 --- a/analysis/wordpos/72-wordpos.js +++ b/analysis/wordpos/72-wordpos.js @@ -14,7 +14,7 @@ * limitations under the License. **/ -var RED = require("../../red/red"); +var RED = require(process.env.NODE_RED_HOME+"/red/red"); var util = require("util"); var WordPos = require('wordpos'); diff --git a/hardware/blink/76-blinkstick.js b/hardware/blink/76-blinkstick.js index cae30ca8..ebbdacc7 100644 --- a/hardware/blink/76-blinkstick.js +++ b/hardware/blink/76-blinkstick.js @@ -14,7 +14,7 @@ * limitations under the License. **/ -var RED = require("../../red/red"); +var RED = require(process.env.NODE_RED_HOME+"/red/red"); var blinkstick = require("blinkstick"); Object.size = function(obj) { diff --git a/hardware/blink/77-blink1.js b/hardware/blink/77-blink1.js index 236683ed..54e7a3be 100644 --- a/hardware/blink/77-blink1.js +++ b/hardware/blink/77-blink1.js @@ -14,7 +14,7 @@ * limitations under the License. **/ -var RED = require("../../red/red"); +var RED = require(process.env.NODE_RED_HOME+"/red/red"); var Blink1 = require("node-blink1"); function Blink1Node(n) { diff --git a/hardware/digiRGB/78-digiRGB.js b/hardware/digiRGB/78-digiRGB.js index 717da0a3..6826b0f2 100644 --- a/hardware/digiRGB/78-digiRGB.js +++ b/hardware/digiRGB/78-digiRGB.js @@ -17,7 +17,7 @@ // Sample Node-RED node file // Require main module -var RED = require("../../red/red"); +var RED = require(process.env.NODE_RED_HOME+"/red/red"); var HID = require('node-hid'); var device; var node; diff --git a/hardware/scanBLE/101-scanBLE.js b/hardware/scanBLE/101-scanBLE.js index 04a308b5..da8478cd 100644 --- a/hardware/scanBLE/101-scanBLE.js +++ b/hardware/scanBLE/101-scanBLE.js @@ -19,7 +19,7 @@ **/ //might need to modify accordingly -var RED = require("../../red/red"); +var RED = require(process.env.NODE_RED_HOME+"/red/red"); //import noble var noble = require('noble'); diff --git a/hardware/sensorTag/79-sensorTag.js b/hardware/sensorTag/79-sensorTag.js index 92555099..8c7a3309 100644 --- a/hardware/sensorTag/79-sensorTag.js +++ b/hardware/sensorTag/79-sensorTag.js @@ -17,7 +17,7 @@ // Sample Node-RED node file // Require main module -var RED = require("../../red/red"); +var RED = require(process.env.NODE_RED_HOME+"/red/red"); var SensorTag = require('sensortag'); var stag; var node; diff --git a/social/notify/57-notify.js b/social/notify/57-notify.js index 9330966d..db4b2e20 100644 --- a/social/notify/57-notify.js +++ b/social/notify/57-notify.js @@ -14,9 +14,9 @@ * limitations under the License. **/ -var RED = require("../../red/red"); +var RED = require(process.env.NODE_RED_HOME+"/red/red"); var growl = require('growl'); -var imagefile = __dirname+"/../../public/mqtt-node-red.png"; +var imagefile = process.env.NODE_RED_HOME+"/public/mqtt-node-red.png"; function NotifyNode(n) { RED.nodes.createNode(this,n); diff --git a/social/prowl/57-prowl.js b/social/prowl/57-prowl.js index d59dc2a3..df07759e 100644 --- a/social/prowl/57-prowl.js +++ b/social/prowl/57-prowl.js @@ -14,7 +14,7 @@ * limitations under the License. **/ -var RED = require("../../red/red"); +var RED = require(process.env.NODE_RED_HOME+"/red/red"); var Prowl = require('node-prowl'); var util = require('util'); @@ -24,7 +24,7 @@ var util = require('util'); // module.exports = {prowlkey:'My-API-KEY'} try { - var pushkey = require("../../settings").prowl || require("../../../pushkey.js"); + var pushkey = require(process.env.NODE_RED_HOME+"/settings").prowl || require(process.env.NODE_RED_HOME+"/../pushkey.js"); } catch(err) { util.log("[57-prowl.js] Error: Failed to load Prowl credentials"); diff --git a/social/pushbullet/57-pushbullet.js b/social/pushbullet/57-pushbullet.js index b839e893..75f774af 100644 --- a/social/pushbullet/57-pushbullet.js +++ b/social/pushbullet/57-pushbullet.js @@ -14,7 +14,7 @@ * limitations under the License. **/ -var RED = require("../../red/red"); +var RED = require(process.env.NODE_RED_HOME+"/red/red"); var PushBullet = require('pushbullet'); var util = require('util'); @@ -24,7 +24,7 @@ var util = require('util'); // module.exports = {pushbullet:'My-API-KEY', deviceid:'12345'} try { - var pushkey = require("../../settings").pushbullet || require("../../../pushkey.js"); + var pushkey = require(process.env.NODE_RED_HOME+"/settings").pushbullet || require(process.env.NODE_RED_HOME+"/../pushkey.js"); } catch(err) { util.log("[57-pushbullet.js] Error: Failed to load PushBullet credentials"); diff --git a/social/xmpp/92-xmpp.js b/social/xmpp/92-xmpp.js index 15f95795..90f53531 100644 --- a/social/xmpp/92-xmpp.js +++ b/social/xmpp/92-xmpp.js @@ -22,12 +22,12 @@ console.warn=(function() { // suppress warning from stringprep when not needed) }; })(); -var RED = require("../../red/red"); +var RED = require(process.env.NODE_RED_HOME+"/red/red"); var xmpp = require('simple-xmpp'); console.warn = orig; try { - var xmppkey = require("../../settings").xmpp || require("../../../xmppkeys.js"); + var xmppkey = require(process.env.NODE_RED_HOME+"/settings").xmpp || require(process.env.NODE_RED_HOME+"/../xmppkeys.js"); } catch(err) { throw new Error("Failed to load XMPP credentials"); } diff --git a/storage/leveldb/67-leveldb.js b/storage/leveldb/67-leveldb.js index 050d456b..3289a961 100644 --- a/storage/leveldb/67-leveldb.js +++ b/storage/leveldb/67-leveldb.js @@ -14,7 +14,7 @@ * limitations under the License. **/ -var RED = require("../../red/red"); +var RED = require(process.env.NODE_RED_HOME+"/red/red"); var lvldb = require('level'); function LevelNode(n) {