Skip to content

Commit 0ad58ca

Browse files
authored
Merge pull request #3331 from dotty-staging/fix-cygwin
fix version check in Cygwin
2 parents c714b51 + f201d79 commit 0ad58ca

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

dist/bin/common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ if [ ! -x "$JAVACMD" ] ; then
6262
fi
6363

6464
# parses 1.7, 1.8, 9, etc out of java version "1.8.0_91"
65-
JAVA_VERSION=$("$JAVACMD" -version 2>&1 | grep ' version "' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
65+
JAVA_VERSION=$("$JAVACMD" -version 2>&1 | grep ' version "' | tr '\r' '\n' | sed 's/.*version "\([0-9]*\)\(\.[0-9]*\)\{0,1\}\(.*\)*"/\1\2/; 1q')
6666

6767
if [ "$JAVA_VERSION" != "1.8" ] ; then
6868
echo "Error: Java 8 is required, actual $JAVA_VERSION"

0 commit comments

Comments
 (0)