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

remove invisible carriage-return appended to java_version under cygwin

This commit is contained in:
Phil 2018-01-05 14:36:17 -07:00
parent f66161a14f
commit 13f2bafdf8
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

@ -180,7 +180,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" -Xms128M -Xmx512M -version 2>&1 | grep ' version "' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q') 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')
vlog "[process_args] java_version = '$java_version'" vlog "[process_args] java_version = '$java_version'"
} }