[refactoring] small changes

Author: tofi86

src/universalJavaApplicationStub

@@ -11,7 +11,7 @@
 #                                                                                #
 # @author    Tobias Fischer                                                      #
 # @url       https://github.com/tofi86/universalJavaApplicationStub              #
-# @date      2017-11-01                                                          #
+# @date      2018-01-07                                                          #
 # @version   2.1.0                                                               #
 #                                                                                #
 ##################################################################################
@@ -405,8 +405,10 @@ function get_comparable_java_version() {
 ################################################################################
 function is_valid_requirement_pattern() {
   local java_req=$1
-  # first test matches old Java versioning scheme (up to 1.8), second test matches new scheme (starting with 9)
-  if [[ ${java_req} =~ ^1\.[4-8](\.0)?(\.0_[0-9]+)?[*+]?$ ]] || [[ ${java_req} =~ ^(9|1[0-9])(-ea|[*+]|(\.[0-9]+){1,2}[*+]?)?$ ]]; then
+  java8pattern='1\.[4-8](\.0)?(\.0_[0-9]+)?[*+]?'
+  java9pattern='(9|1[0-9])(-ea|[*+]|(\.[0-9]+){1,2}[*+]?)?'
+  # test matches either old Java versioning scheme (up to 1.8) or new scheme (starting with 9)
+  if [[ ${java_req} =~ ^(${java8pattern}|${java9pattern})$ ]]; then
     return 0
   else
     return 1
@@ -463,7 +465,7 @@ function does_java_version_satisfy_requirement() {
       return 1
     fi
 
-  # requirement ends with * modifier
+  # requirement ends with + modifier
   # e.g. 1.8+, 9+, 9.1+, 9.2.4+, 10+, 10.1+, 10.1.35+
   elif [[ ${java_req} == *+ ]] ; then
     local java_req_num=$(get_comparable_java_version ${java_req})
@@ -539,7 +541,7 @@ elif [ ! -z ${JVMVersion} ] ; then
 
 	# then additionally check the Oracle JRE plugin whether it's a higher/newer compatible version
 	if [ -x "${oracle_jre_plugin}" ] && does_java_version_satisfy_requirement ${oracle_jre_version} ${JVMVersion} ; then
-		this_java_ver=$(get_comparable_java_version $(get_java_version_from_cmd "${oracle_jre_plugin}"))
+		this_java_ver=$(get_comparable_java_version ${oracle_jre_version})
 		# use this compatible version only if the above returned empty or if the version number is higher
 		if [ -z "${JAVACMD}" ] || [ ${this_java_ver} -ge ${JAVACMD_version} ] ; then
 			JAVACMD="${oracle_jre_plugin}"
@@ -549,7 +551,7 @@ elif [ ! -z ${JVMVersion} ] ; then
 
 	# then additionally check the Apple JRE plugin whether it's a higher/newer compatible version
 	if [ -x "${apple_jre_plugin}" ] && does_java_version_satisfy_requirement ${apple_jre_version} ${JVMVersion} ; then
-		this_java_ver=$(get_comparable_java_version $(get_java_version_from_cmd "${apple_jre_plugin}"))
+		this_java_ver=$(get_comparable_java_version ${apple_jre_version})
 		# use this compatible version only if the above returned empty or if the version number is higher
 		if [ -z "${JAVACMD}" ] || [ ${this_java_ver} -ge ${JAVACMD_version} ] ; then
 			JAVACMD="${apple_jre_plugin}"

test/java-version-tester.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Java JRE version tester
-# tofi86 @ 2017-11-01
+# tofi86 @ 2018-01-07
 
 
 
@@ -84,8 +84,10 @@ function get_comparable_java_version() {
 ################################################################################
 function is_valid_requirement_pattern() {
   local java_req=$1
-  # first test matches old Java versioning scheme (up to 1.8), second test matches new scheme (starting with 9)
-  if [[ ${java_req} =~ ^1\.[4-8](\.0)?(\.0_[0-9]+)?[*+]?$ ]] || [[ ${java_req} =~ ^(9|1[0-9])(-ea|[*+]|(\.[0-9]+){1,2}[*+]?)?$ ]]; then
+  java8pattern='1\.[4-8](\.0)?(\.0_[0-9]+)?[*+]?'
+  java9pattern='(9|1[0-9])(-ea|[*+]|(\.[0-9]+){1,2}[*+]?)?'
+  # test matches either old Java versioning scheme (up to 1.8) or new scheme (starting with 9)
+  if [[ ${java_req} =~ ^(${java8pattern}|${java9pattern})$ ]]; then
     return 0
   else
     return 1
@@ -142,7 +144,7 @@ function does_java_version_satisfy_requirement() {
       return 1
     fi
 
-  # requirement ends with * modifier
+  # requirement ends with + modifier
   # e.g. 1.8+, 9+, 9.1+, 9.2.4+, 10+, 10.1+, 10.1.35+
   elif [[ ${java_req} == *+ ]] ; then
     local java_req_num=$(get_comparable_java_version ${java_req})