From 4c9b3158312b6e2050fd48f2e452328f2f9d3499 Mon Sep 17 00:00:00 2001
From: Luc Henninger <luc.henninger@orange.fr>
Date: Sun, 17 Jan 2021 19:18:09 +0100
Subject: [PATCH] Update sbt for cygwin environment support

See issue #6260
---
 src/universal/bin/sbt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/universal/bin/sbt b/src/universal/bin/sbt
index c5bb32333..64c8527be 100755
--- a/src/universal/bin/sbt
+++ b/src/universal/bin/sbt
@@ -106,7 +106,7 @@ acquire_sbt_jar () {
 }
 
 rt_export_file () {
-  echo "${sbt_bin_dir}/java9-rt-export.jar"
+  echo "$(cygwinpath "${sbt_bin_dir}/java9-rt-export.jar")"
 }
 
 # execRunner should be called only once to give up control to java
@@ -340,7 +340,7 @@ copyRt() {
     rtexport=$(rt_export_file)
     # The grep for java9-rt-ext- matches the filename prefix printed in Export.java
     java9_ext=$("$java_cmd" "${sbt_options[@]}" "${java_args[@]}" \
-      -jar "$rtexport" --rt-ext-dir | grep java9-rt-ext-)
+      -jar "$rtexport" --rt-ext-dir | grep java9-rt-ext- | tr -d '\r')
     java9_rt=$(echo "$java9_ext/rt.jar")
     vlog "[copyRt] java9_rt = '$java9_rt'"
     if [[ ! -f "$java9_rt" ]]; then