Merge pull request #6719 from eed3si9n/wip/line-endings

Fix line endings in msi
2021-11-20 13:33:43 -05:00 · 2021-11-20 13:33:43 -05:00 · b2f0b7dada
parent aa22c02d84 307f46a3c0
commit b2f0b7dada
2 changed files with 5 additions and 0 deletions
--- 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
--- 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
+