[merge] Resolve bad cherry-pick from fork branch

foreversd · Jan 5, 2012 · 285b659 · 285b659
1 parent 1f673f9
commit 285b659
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/forever.js b/lib/forever.js
@@ -12,6 +12,7 @@ var fs = require('fs'),
     exec = require('child_process').exec,
     spawn = require('child_process').spawn,
     cliff = require('cliff'),
+    daemon = require('daemon'),
     nconf = require('nconf'),
     nssocket = require('nssocket'),
     portfinder = require('portfinder'),

diff --git a/lib/forever/monitor.js b/lib/forever/monitor.js
@@ -225,7 +225,7 @@ Monitor.prototype.trySpawn = function () {
 
   return this.fork
     ? this._forkSpawn()
-    : spawn(this.command, this.options, this.spawnWith);
+    : spawn(this.command, this.args, this.spawnWith);
 };
 
 //
@@ -434,7 +434,7 @@ Monitor.prototype._forkSpawn = function () {
   });
 
   process.execPath = this.command;
-  forked = fork(this.options[0], this.options.slice(1), hackSpawn);
+  forked = fork(this.args[0], this.args.slice(1), hackSpawn);
   process.execPath = execPath;
   return forked;
 };
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
     "minimatch": "0.0.x",
     "nconf": "0.5.x",
     "nssocket": "0.3.x",
-    "node-fork": "git://git@github.com:bmeck/node-fork.git",
+    "node-fork": "git://github.com/bmeck/node-fork.git",
     "optimist": "0.2.x",
     "pkginfo": "0.x.x",
     "portfinder": "0.x.x",