luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #136 from sbt/wip/java_version 

Fix Java version detection
This commit is contained in:
Dale Wijnand 2017-01-11 15:27:00 +00:00 committed by GitHub
parent 697e1239cb f14b165523
commit 1ca44177f5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/universal/bin/sbt-launch-lib.bash
View File

@ -147,7 +147,7 @@ process_args () {
process_my_args "${myargs[@]}"
}
java_version=$("$java_cmd" -Xmx512M -version 2>&1 | awk -F '"' '/version/ {print $2}')
java_version=$("$java_cmd" -Xmx512M -version 2>&1 | sed 's/.*version "\([0-9]*\)\.\([0-9]*\)\..*"/\1.\2/; 1q')
vlog "[process_args] java_version = '$java_version'"
}