changeset 141:1a156a7746a7

RLGWebD: use NODE_PATH to find modules.
author John "Elwin" Edwards
date Wed, 14 Aug 2013 08:04:36 -0700
parents 789c094675f4
children c4304f08e35b
files rlgwebd rlgwebd.js
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/rlgwebd	Mon Jul 22 07:51:53 2013 -0700
+++ b/rlgwebd	Wed Aug 14 08:04:36 2013 -0700
@@ -1,9 +1,12 @@
 #!/bin/sh
 
+NODE_PATH=/usr/lib/node_modules
 LOGFILE=/var/local/rlgwebd/log
 CTLSOCKET=/var/local/rlgwebd/ctl
 RLGWEBDJS=./rlgwebd.js
 
+export NODE_PATH
+
 if [ $UID != 0 ]
 then
   echo "$0 needs to run as root." >&2
--- a/rlgwebd.js	Mon Jul 22 07:51:53 2013 -0700
+++ b/rlgwebd.js	Wed Aug 14 08:04:36 2013 -0700
@@ -1,7 +1,5 @@
 #!/usr/bin/env node
 
-// If you can't quite trust node to find it on its own
-var localModules = '/usr/local/lib/node_modules/';
 var http = require('http');
 var net = require('net');
 var url = require('url');
@@ -9,9 +7,10 @@
 var fs = require('fs');
 var events = require('events');
 var child_process = require('child_process');
-var posix = require(path.join(localModules, "posix"));
-var pty = require(path.join(localModules, "pty.js"));
-var WebSocketServer = require(path.join(localModules, "websocket")).server;
+// Dependencies
+var posix = require("posix");
+var pty = require("pty.js");
+var WebSocketServer = require("websocket").server;
 
 /* Configuration variables */
 // The first file is NOT in the chroot.