Merge pull request #105 from artnowo/master

Fixed handling jdk-* and jre-* Java installation paths
puniverse · Jun 28, 2016 · 2b9a20c · 2b9a20c
2 parents e2b5048 + a275eb3
commit 2b9a20c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/capsule/src/main/java/Capsule.java b/capsule/src/main/java/Capsule.java
@@ -4103,8 +4103,11 @@ static String isJavaDir(String fileName) {
             m.find();
             return shortJavaVersion(m.group(1));
         } else if (fileName.startsWith("jdk") || fileName.startsWith("jre") || fileName.endsWith(".jdk") || fileName.endsWith(".jre")) {
-            if (fileName.startsWith("jdk") || fileName.startsWith("jre"))
+            if (fileName.startsWith("jdk-") || fileName.startsWith("jre-"))
+                fileName = fileName.substring(4);
+            else if (fileName.startsWith("jdk") || fileName.startsWith("jre"))
                 fileName = fileName.substring(3);
+
             if (fileName.endsWith(".jdk") || fileName.endsWith(".jre"))
                 fileName = fileName.substring(0, fileName.length() - 4);
             return shortJavaVersion(fileName);

diff --git a/capsule/src/test/java/CapsuleTest.java b/capsule/src/test/java/CapsuleTest.java
@@ -1300,6 +1300,8 @@ public void isJavaDir() {
         assertEquals("1.8.0", Capsule.isJavaDir("jdk-8-oracle"));
         assertEquals("1.8.0", Capsule.isJavaDir("jre-8-oracle"));
         assertEquals("1.8.0", Capsule.isJavaDir("jdk-8-oracle-x64"));
+        assertEquals("1.8.0", Capsule.isJavaDir("jdk-1.8.0"));
+        assertEquals("1.8.0", Capsule.isJavaDir("jre-1.8.0"));
     }
 
     @Test