Use argv for settings alongside JSON.

Schoonology · Schoonology · commit d496ad1a428e · 2014-05-21T23:37:14.000-04:00
diff --git a/lib/app.js b/lib/app.js
@@ -349,6 +349,7 @@ module.exports = {
                           'firebase.json settings file');
         process.exit(1);
       }
+      util._extend(settings, argv);
       if (typeof(settings.firebase) !== 'string') {
         console.log(chalk.red('Initialization Error') +' - Could not read ' +
                           'firebase.json settings file');

Original file line number	Diff line number	Diff line change
`@@ -349,6 +349,7 @@ module.exports = {`
`349`	`349`	`'firebase.json settings file');`
`350`	`350`	`process.exit(1);`
`351`	`351`	`}`
	`352`	`+ util._extend(settings, argv);`
`352`	`353`	`if (typeof(settings.firebase) !== 'string') {`
`353`	`354`	`console.log(chalk.red('Initialization Error') +' - Could not read ' +`
`354`	`355`	`'firebase.json settings file');`