[pull-request] #244, from @michaelcdillon

foreversd · Apr 19, 2012 · 1ad16b0 · 1ad16b0
1 parent ea5317c
commit 1ad16b0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/examples/initd-example b/examples/initd-example
@@ -40,7 +40,7 @@ start() {
 
         # Launch the application
         start_daemon
-            $forever start -p $forever_dir --pidfile $pidfile -l $logfile -a -d $INSTANCE_DIR $SOURCE_NAME
+            $forever start -p $forever_dir --pidFile $pidfile -l $logfile -a -d $INSTANCE_DIR $SOURCE_NAME
         RETVAL=$?
     else
         echo "Instance already running"
@@ -70,7 +70,7 @@ stop() {
 
 getForeverId() {
     local pid=$(pidofproc -p $pidfile)
-    $forever list -p $forever_dir | $sed -e 's/\x1b\[[0-9; ]*m//g' | $awk "\$4 == \"$pid]\" { gsub(/[\[\]]/, \"\", \$1); print \$1; }"
+    $forever list -p $forever_dir | $sed -e 's/\x1b\[[0-9; ]*m//g' | $awk "\$6 && \$6 == \"$pid\" { gsub(/[\[\]]/, \"\", \$2); print \$2; }";
 }
 id=$(getForeverId)
 

diff --git a/lib/forever/cli.js b/lib/forever/cli.js
@@ -195,7 +195,7 @@ var getOptions = cli.getOptions = function (file) {
     options[key] = app.config.get(key);
   });
 
-  options.sourceDir = file && file[0] !== '/' ? process.cwd() : '/';
+  options.sourceDir = options.sourceDir || (file && file[0] !== '/' ? process.cwd() : '/');
   if (options.sourceDir) {
     options.spawnWith = {cwd: options.sourceDir};
   }