From 5a0bde442dec7d9a1bdc35655541902fb873172a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Mickevi=C4=8Dius?= Date: Wed, 14 Feb 2018 14:00:36 +0200 Subject: [PATCH] Use only integers for versions --- src/universal/bin/sbt-launch-lib.bash | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/universal/bin/sbt-launch-lib.bash b/src/universal/bin/sbt-launch-lib.bash index 222e4dbb9..b8bcc06c4 100755 --- a/src/universal/bin/sbt-launch-lib.bash +++ b/src/universal/bin/sbt-launch-lib.bash @@ -106,12 +106,12 @@ get_mem_opts () { (( $codecache > 128 )) || codecache=128 (( $codecache < 512 )) || codecache=512 local class_metadata_size=$(( $codecache * 2 )) - local class_metadata_opt=$([[ "$java_version" < "1.8" ]] && echo "MaxPermSize" || echo "MaxMetaspaceSize") + local class_metadata_opt=$([[ "$java_version" < "8" ]] && echo "MaxPermSize" || echo "MaxMetaspaceSize") local arg_xms=$([[ "${java_args[@]}" == *-Xms* ]] && echo "" || echo "-Xms${mem}m") local arg_xmx=$([[ "${java_args[@]}" == *-Xmx* ]] && echo "" || echo "-Xmx${mem}m") local arg_rccs=$([[ "${java_args[@]}" == *-XX:ReservedCodeCacheSize* ]] && echo "" || echo "-XX:ReservedCodeCacheSize=${codecache}m") - local arg_meta=$([[ "${java_args[@]}" == *-XX:${class_metadata_opt}* && ! "$java_version" < "1.8" ]] && echo "" || echo "-XX:${class_metadata_opt}=${class_metadata_size}m") + local arg_meta=$([[ "${java_args[@]}" == *-XX:${class_metadata_opt}* && ! "$java_version" < "8" ]] && echo "" || echo "-XX:${class_metadata_opt}=${class_metadata_size}m") echo "${arg_xms} ${arg_xmx} ${arg_rccs} ${arg_meta}" fi @@ -179,14 +179,9 @@ process_args () { process_my_args "${myargs[@]}" } - ## parses java version from the -version output line, e.g.: - ## java version "10-ea" 2018-03-20 --> 10 - ## openjdk version "9" --> 9 - ## java version "1.8.0_162" --> 1.8 - ## openjdk version "1.8.0_144" --> 1.8 - ## java version "1.7.0_151" --> 1.7 - ## java version "1.6.0_45" --> 1.6 - java_version=$("$java_cmd" -Xms128M -Xmx512M -version 2>&1 | tr '\r' '\n' | grep ' version "' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*/\1\2/; 1q') + ## parses java version from the -version output line + ## https://regex101.com/r/0r3kKb/1/tests + java_version=$("$java_cmd" -Xms128M -Xmx512M -version 2>&1 | tr '\r' '\n' | grep ' version "' | sed 's/.*version "\(1\.\)\?\([0-9]*\)\{0,1\}\(.*\)*/\2/; 1q') vlog "[process_args] java_version = '$java_version'" } @@ -268,7 +263,7 @@ run() { argumentCount=$# # TODO - java check should be configurable... - checkJava "1.6" + checkJava "6" # Java 9 support copyRt