From 307f46a3c0051e5c901cab316cae6ddce587a02b Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 19 Nov 2021 20:41:39 -0500
Subject: [PATCH] Fix line endings in msi

Fixes #6717
---
 .gitattributes                   | 4 ++++
 launcher-package/src/windows/sbt | 1 +
 2 files changed, 5 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 11d44bd7f..5b6b22eaf 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,7 @@
+sbt text eol=lf
+*.sh text eol=lf
+launcher-package/src/windows/sbt text eol=lf
+
 # Exclude contraband generated files from diff (by default - you can see it if you want)
 **/contraband-scala/**/* -diff merge=ours
 **/contraband-scala/**/* linguist-generated=true
diff --git a/launcher-package/src/windows/sbt b/launcher-package/src/windows/sbt
index ce24abbdd..c8d63bbd4 100644
--- a/launcher-package/src/windows/sbt
+++ b/launcher-package/src/windows/sbt
@@ -36,3 +36,4 @@ else
   # Use Jansi to intercept ANSI sequences
   "$JAVA_CMD" -Dsbt.log.format=true $JAVA_OPTS $SBT_OPTS -cp "$WDIR/sbt-launch.jar" xsbt.boot.Boot "$@"
 fi
+