From 8af68039940b70d4415955f3ff2fd19e3366b590 Mon Sep 17 00:00:00 2001
From: Charlie McConnell <charlie@charlieistheman.com>
Date: Fri, 4 May 2012 12:14:56 -0700
Subject: [PATCH] [fix] Revert bad options commit.

---
 lib/forever/cli.js | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/lib/forever/cli.js b/lib/forever/cli.js
index 218d7970..68e2681d 100644
--- a/lib/forever/cli.js
+++ b/lib/forever/cli.js
@@ -71,24 +71,7 @@ var help = [
 
 var app = flatiron.app;
 
-var argvOptions = cli.argvOptions = {
-  'command':   {alias: 'c'},
-  'errFile':   {alias: 'e'},
-  'logFile':   {alias: 'l'},
-  'append':    {alias: 'a', boolean: true},
-  'max':       {alias: 'm'},
-  'outFile':   {alias: 'o'},
-  'path':      {alias: 'p'},
-  'help':      {alias: 'h'},
-  'silent':    {alias: 's', boolean: true},
-  'verbose':   {alias: 'v', boolean: true},
-  'watch':     {alias: 'w', boolean: true},
-  'debug':     {alias: 'd', boolean: true},
-  'plain':     {boolean: true}
-};
-
 app.use(flatiron.plugins.cli, {
-  argv: argvOptions,
   usage: help
 });
 
@@ -107,6 +90,24 @@ var actions = [
   'cleanlogs'
 ];
 
+var argvOptions = cli.argvOptions = {
+  'command':   {alias: 'c'},
+  'errFile':   {alias: 'e'},
+  'logFile':   {alias: 'l'},
+  'append':    {alias: 'a', boolean: true},
+  'max':       {alias: 'm'},
+  'outFile':   {alias: 'o'},
+  'path':      {alias: 'p'},
+  'help':      {alias: 'h'},
+  'silent':    {alias: 's', boolean: true},
+  'verbose':   {alias: 'v', boolean: true},
+  'watch':     {alias: 'w', boolean: true},
+  'debug':     {alias: 'd', boolean: true},
+  'plain':     {boolean: true}
+};
+
+app.config.argv().env();
+
 var reserved = ['root', 'pidPath'];
 
 //
@@ -184,8 +185,7 @@ var getOptions = cli.getOptions = function (file) {
   // we've removed some before.
   //
   app.config.stores.argv.store = {};
-
-  app.config.use('argv', { argv: argvOptions });
+  app.config.use('argv', argvOptions);
 
   [
     'pidFile', 'logFile', 'errFile', 'watch', 'minUptime', 'append',