Merge pull request #1255 from NativeScript/fatme/fix-android-tools

Fatme · Fatme · commit 89d4a2186e27 · 2015-11-26T16:49:58.000+02:00
Fix "ANDROID_HOME environment variable is not set correctly"  error
diff --git a/lib/android-tools-info.ts b/lib/android-tools-info.ts
@@ -44,10 +44,10 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {
 				if(this.validateAndroidHomeEnvVariable(this.androidHome).wait()) {
 					let androidPath = path.join(this.androidHome, "tools", this.androidExecutableName);
 					if(!this.trySetAndroidPath(androidPath).wait() && !this.trySetAndroidPath(this.androidExecutableName).wait()) {
-						this.$errors.failWithoutHelp(`Unable to find "${this.androidExecutableName}" executable file. Make sure you have set ANDROID_HOME environment variable correctly.`);
+						this.printMessage(`Unable to find "${this.androidExecutableName}" executable file. Make sure you have set ANDROID_HOME environment variable correctly.`);
 					}
 				} else {
-					this.$errors.failWithoutHelp("ANDROID_HOME environment variable is not set correctly.");
+					this.printMessage("ANDROID_HOME environment variable is not set correctly.");
 				}
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,10 @@ export class AndroidToolsInfo implements IAndroidToolsInfo {`
`44`	`44`	`if(this.validateAndroidHomeEnvVariable(this.androidHome).wait()) {`
`45`	`45`	`let androidPath = path.join(this.androidHome, "tools", this.androidExecutableName);`
`46`	`46`	`if(!this.trySetAndroidPath(androidPath).wait() && !this.trySetAndroidPath(this.androidExecutableName).wait()) {`
`47`		- this.$errors.failWithoutHelp(`Unable to find "${this.androidExecutableName}" executable file. Make sure you have set ANDROID_HOME environment variable correctly.`);
	`47`	+ this.printMessage(`Unable to find "${this.androidExecutableName}" executable file. Make sure you have set ANDROID_HOME environment variable correctly.`);
`48`	`48`	`}`
`49`	`49`	`} else {`
`50`		`- this.$errors.failWithoutHelp("ANDROID_HOME environment variable is not set correctly.");`
	`50`	`+ this.printMessage("ANDROID_HOME environment variable is not set correctly.");`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`