Merge pull request #20 from firebase/v1.0.3

Chris Raynor · Chris Raynor · commit 5564bcafa15e · 2014-05-21T21:48:51.000-07:00
V1.0.3
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');
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "firebase-tools",
   "preferGlobal": true,
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "The Firebase Command Line Tools",
   "keywords": [
     "firebase"

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');`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "firebase-tools",`
`3`	`3`	`"preferGlobal": true,`
`4`		`- "version": "1.0.2",`
	`4`	`+ "version": "1.0.3",`
`5`	`5`	`"description": "The Firebase Command Line Tools",`
`6`	`6`	`"keywords": [`
`7`	`7`	`"firebase"`