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

Fix line endings in msi 

Fixes #6717
This commit is contained in:
Eugene Yokota 2021-11-19 20:41:39 -05:00
parent aa22c02d84
commit 307f46a3c0
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -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) # Exclude contraband generated files from diff (by default - you can see it if you want)
**/contraband-scala/**/* -diff merge=ours **/contraband-scala/**/* -diff merge=ours
**/contraband-scala/**/* linguist-generated=true **/contraband-scala/**/* linguist-generated=true

1
launcher-package/src/windows/sbt
View File

@ -36,3 +36,4 @@ else
# Use Jansi to intercept ANSI sequences # Use Jansi to intercept ANSI sequences
"$JAVA_CMD" -Dsbt.log.format=true $JAVA_OPTS $SBT_OPTS -cp "$WDIR/sbt-launch.jar" xsbt.boot.Boot "$@" "$JAVA_CMD" -Dsbt.log.format=true $JAVA_OPTS $SBT_OPTS -cp "$WDIR/sbt-launch.jar" xsbt.boot.Boot "$@"
fi fi