Merge pull request #80 from appcelerator/timob-16085

[TIMOB-16085] Fixed bug where JAVA_HOME beginning with a tilde was not b...
tidev · Jan 18, 2014 · d73bb6b · d73bb6b
2 parents fd33003 + 2ea9530
commit d73bb6b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+0.2.x
+-------------------
+ * Fixed bug where JAVA_HOME beginning with a tilde was not being resolved to the home directory before checking if the path exists [TIMOB-16085]
+
 0.2.0 (12/18/2013)
 -------------------
  * Added try/catch around analytics processing with showErrors flag to display errors

diff --git a/lib/jdk.js b/lib/jdk.js
@@ -47,7 +47,7 @@ exports.detect = function detect(config, opts, finished) {
 	if (cache && !opts.bypassCache) return finished(cache);
 
 	var exe = process.platform == 'win32' ? '.exe' : '',
-		javaHome = config.get('java.home', process.env.JAVA_HOME && fs.existsSync(process.env.JAVA_HOME) ? process.env.JAVA_HOME : null),
+		javaHome = config.get('java.home', process.env.JAVA_HOME) || null,
 		result = cache = {
 			version: null,
 			build: null,
@@ -57,9 +57,11 @@ exports.detect = function detect(config, opts, finished) {
 		};
 
 	// sanity check the java home
-	javaHome && (javaHome = afs.resolvePath(javaHome));
-	if (!fs.existsSync(javaHome)) {
-		javaHome = null;
+	if (javaHome) {
+		javaHome = afs.resolvePath(javaHome);
+		if (!fs.existsSync(javaHome)) {
+			javaHome = null;
+		}
 	}
 	result.home = javaHome;