Permalink
Browse files

[fix] Revert bad options commit.

  • Loading branch information...
1 parent 5d21f97 commit 8af68039940b70d4415955f3ff2fd19e3366b590 @AvianFlu AvianFlu committed May 4, 2012
Showing with 19 additions and 19 deletions.
  1. +19 −19 lib/forever/cli.js
View
38 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',

0 comments on commit 8af6803

Please sign in to comment.