Skip to content

Commit

Permalink
Merge pull request #260 from mpilquist/java8-bash
Browse files Browse the repository at this point in the history
Fix java 8 version check
  • Loading branch information
jsuereth committed Jun 21, 2014
2 parents afbc74c + 6348559 commit 755102d
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ get_mem_opts () {
[[ "${java_args[@]}" == *-XX:ReservedCodeCacheSize* ]];
then
echo ""
elif [[ !$no_java_version_check ]] && [[ "$java_version" > "1.8" ]]; then
elif [[ !$no_version_check ]] && [[ "$java_version" > "1.8" ]]; then
echo "-Xms${mem}m -Xmx${mem}m -XX:ReservedCodeCacheSize=${codecache}m"
else
echo "-Xms${mem}m -Xmx${mem}m -XX:MaxPermSize=${perm}m -XX:ReservedCodeCacheSize=${codecache}m"
Expand Down Expand Up @@ -290,7 +290,7 @@ loadConfigFile() {
# Now check to see if it's a good enough version
# TODO - Check to see if we have a configured default java version, otherwise use 1.6
java_version_check() {
declare -r java_version=$("$java_cmd" -version 2>&1 | awk -F '"' '/version/ {print $2}')
readonly java_version=$("$java_cmd" -version 2>&1 | awk -F '"' '/version/ {print $2}')
if [[ "$java_version" == "" ]]; then
echo
echo No java installations was detected.
Expand Down

0 comments on commit 755102d

Please sign in to comment.