Experimental support for Java 9 // refs #43

Author: tofi86

CHANGELOG.md

@@ -1,6 +1,9 @@
 ChangeLog
 ---------
 
+### v2.1.0 (2017-xx-xx)
+* Support for Java 9 with new version number schema (fixes #43)
+
 ### v2.0.2 (2017-04-23)
 * Bugfix: do NOT expand/evaluate the default Oracle Classpath (`App.app/Contents/Java/*`) (PR #42, Thanks to @mguessan for his contribution)
 

src/universalJavaApplicationStub

@@ -13,8 +13,8 @@
 #                                                                                #
 # @author    Tobias Fischer                                                      #
 # @url       https://github.com/tofi86/universalJavaApplicationStub              #
-# @date      2017-11-27                                                          #
-# @version   2.0.2                                                               #
+# @date      2017-06-12                                                          #
+# @version   2.1.0                                                               #
 #                                                                                #
 #                                                                                #
 ##################################################################################
@@ -289,58 +289,69 @@ fi
 
 
 
-# helper
-# function: extract Java version string
-#           from java -version command
-############################################
-
+# helper function:
+# extract Java version string from `java -version` command
+# works for both old (1.8) and new (9) version schema
+##########################################################
 function extractJavaVersionString() {
-  echo `"$1" -version 2>&1 | awk '/version/{print $NF}' | sed -E 's/"//g'`
+  # second sed command strips " and -ea from the version string
+  echo `"$1" -version 2>&1 | awk '/version/{print $NF}' | sed -E 's/"//g;s/-ea//g'`
 }
 
-# helper
-# function: extract Java major version
-#           from java version string
-############################################
 
+# helper function:
+# extract Java major version from java version string
+# - input '1.7.0_76' returns '7'
+# - input '1.8.0_121' returns '8'
+# - input '9-ea' returns '9'
+# - input '9.0.3' returns '9'
+##########################################################
 function extractJavaMajorVersion() {
-  version_str=$(extractJavaVersionString "$1")
-  echo ${version_str} | sed -E 's/([0-9.]{3})[0-9_.]{5,6}/\1/g'
+  java_ver=$1
+  # Java 6, 7, 8 starts with 1.x
+  if [ ${java_ver:0:2} == "1." ] ; then
+    echo ${java_ver} | sed -E 's/1\.([0-9])[0-9_.]{2,6}/\1/g'
+  else
+    # Java 9+ starts with x using semver versioning
+    echo ${java_ver} | sed -E 's/([0-9]+)(-ea|(\.[0-9]+)*)/\1/g'
+  fi
 }
 
-# helper
-# function: generate comparable Java version
-#           number from java version string
-############################################
 
+# helper function:
+# return comparable version for java version string
+# basically just strip punctuation and leading '1.'
+##########################################################
 function comparableJavaVersionNumber() {
-  echo $1 | sed -E 's/[[:punct:]]//g'
+  echo $1 | sed -E 's/^1\.//g;s/[[:punct:]]//g'
 }
 
 
-
-#
-# function: Java version tester
-#           check whether a given java version
-#           satisfies the given requirement
-############################################
-
+# function:
+# Java version tester checks whether a given java version
+# satisfies the given requirement
+# - parameter1: the java major version (6, 7, 8, 9, etc.)
+# - parameter2: the java requirement (1.6, 1.7+, etc.)
+# - return: 0 (satiesfies), 1 (does not), 2 (error)
+##########################################################
 function JavaVersionSatisfiesRequirement() {
   java_ver=$1
   java_req=$2
 
-  # e.g. 1.8*
-  if [[ ${java_req} =~ ^[0-9]\.[0-9]\*$ ]] ; then
-    java_req_num=${java_req:0:3}
-    java_ver_num=${java_ver:0:3}
-    if [ ${java_ver_num} == ${java_req_num} ] ; then
+  # matches requirements with * modifier
+  # e.g. 1.8*, 9*, 9.1*, 9.2.4*, 10*, 10.1*, 10.1.35*
+  if [[ ${java_req} =~ ^[0-9]+(\.[0-9]+)*\*$ ]] ; then
+    # remove last char (*) from requirement string for comparison
+    java_req_num=${java_req::${#java_req}-1}
+    if [ ${java_ver} == ${java_req_num} ] ; then
       return 0
     else
       return 1
     fi
 
-  # e.g. 1.8+
-  elif [[ ${java_req} =~ ^[0-9]\.[0-9]\+$ ]] ; then
+  # matches requirements with + modifier
+  # e.g. 1.8+, 9+, 9.1+, 9.2.4+, 10+, 10.1+, 10.1.35+
+  elif [[ ${java_req} =~ ^[0-9]+(\.[0-9]+)*\+$ ]] ; then
     java_req_num=$(comparableJavaVersionNumber ${java_req})
     java_ver_num=$(comparableJavaVersionNumber ${java_ver})
     if [ ${java_ver_num} -ge ${java_req_num} ] ; then
@@ -349,15 +360,17 @@ function JavaVersionSatisfiesRequirement() {
       return 1
     fi
 
-  # e.g. 1.8
-  elif [[ ${java_req} =~ ^[0-9]\.[0-9]$ ]] ; then
+  # matches standard requirements without modifier
+  # e.g. 1.8, 9, 9.1, 9.2.4, 10, 10.1, 10.1.35
+  elif [[ ${java_req} =~ ^[0-9]+(\.[0-9]+)*$ ]] ; then
     if [ ${java_ver} == ${java_req} ] ; then
       return 0
     else
       return 1
     fi
 
   # not matching any of the above patterns
+  # results in an error
   else
     return 2
   fi
@@ -370,9 +383,9 @@ function JavaVersionSatisfiesRequirement() {
 ############################################
 
 apple_jre_plugin="/Library/Java/Home/bin/java"
-apple_jre_version=`extractJavaMajorVersion "${apple_jre_plugin}"`
+apple_jre_version=$(extractJavaMajorVersion $(extractJavaVersionString "${apple_jre_plugin}"))
 oracle_jre_plugin="/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"
-oracle_jre_version=`extractJavaMajorVersion "${oracle_jre_plugin}"`
+oracle_jre_version=$(extractJavaMajorVersion $(extractJavaVersionString "${oracle_jre_plugin}"))
 
 # first check system variable "$JAVA_HOME"
 if [ -n "$JAVA_HOME" ] ; then