Merge pull request #11 from NativeScript/milanov/fix-android-check-on-mac

TsvetanMilanov · web-flow · commit e189542c8006 · 2017-03-08T19:54:31.000+02:00
Fix android -h check on mac
diff --git a/lib/sys-info.ts b/lib/sys-info.ts
@@ -183,7 +183,8 @@ export class SysInfo implements NativeScriptDoctor.ISysInfo {
 			}
 
 			try {
-				const output = await this.childProcess.spawnFromEvent(pathToAndroid, ["-h"], "close");
+				// On mac android -h returns exit code 1. That's why we need to ignore the error.
+				const output = await this.childProcess.spawnFromEvent(pathToAndroid, ["-h"], "close", { ignoreError: true });
 				if (output) {
 					output.stdout = output.stdout || '';
 					this.androidInstalledCache = output.stdout.indexOf("android") >= 0;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-doctor",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Library that helps identifying if the environment can be used for development of {N} apps.",
   "main": "lib/index.js",
   "types": "./typings/nativescript-doctor.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,8 @@ export class SysInfo implements NativeScriptDoctor.ISysInfo {`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`try {`
`186`		`- const output = await this.childProcess.spawnFromEvent(pathToAndroid, ["-h"], "close");`
	`186`	`+ // On mac android -h returns exit code 1. That's why we need to ignore the error.`
	`187`	`+ const output = await this.childProcess.spawnFromEvent(pathToAndroid, ["-h"], "close", { ignoreError: true });`
`187`	`188`	`if (output) {`
`188`	`189`	`output.stdout = output.stdout \|\| '';`
`189`	`190`	`this.androidInstalledCache = output.stdout.indexOf("android") >= 0;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript-doctor",`
`3`		`- "version": "0.2.0",`
	`3`	`+ "version": "0.2.1",`
`4`	`4`	`"description": "Library that helps identifying if the environment can be used for development of {N} apps.",`
`5`	`5`	`"main": "lib/index.js",`
`6`	`6`	`"types": "./typings/nativescript-doctor.d.ts",`