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

Merge pull request #172 from retronym/ticket/170-java-version-sed 

Fix java version detection in bash script
This commit is contained in:
Dale Wijnand 2017-07-26 09:06:33 +01:00 committed by GitHub
parent 80e8abc22d c487e3166e
commit cc69023585
1 changed files with 4 additions and 4 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

@ -165,7 +165,7 @@ process_args () {
} }
## parses 1.7, 1.8, 9, etc out of java version "1.8.0_91" ## parses 1.7, 1.8, 9, etc out of java version "1.8.0_91"
java_version=$("$java_cmd" -Xmx512M -version 2>&1 | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q') java_version=$("$java_cmd" -Xmx512M -version 2>&1 | grep ' version "' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
vlog "[process_args] java_version = '$java_version'" vlog "[process_args] java_version = '$java_version'"
} }