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

Merge pull request #7367 from JD557/patch-1

This commit is contained in:
eugene yokota 2023-09-07 09:23:20 -04:00 committed by GitHub
parent bc00cee4df bc93eceff7
commit 8bc8e1316b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
launcher-package/src/universal/bin/sbt.bat
View File

@ -112,20 +112,22 @@ if not defined _JAVACMD (
if not defined _JAVACMD set _JAVACMD=java if not defined _JAVACMD set _JAVACMD=java
rem users can set JAVA_OPTS via .jvmopts (sbt-extras style) rem We use the value of the JAVA_OPTS environment variable if defined, rather than the config.
if exist .jvmopts for /F %%A in (.jvmopts) do ( if not defined _JAVA_OPTS if defined JAVA_OPTS set _JAVA_OPTS=%JAVA_OPTS%
set _jvmopts_line=%%A
if not "!_jvmopts_line:~0,1!" == "#" (
if defined _JAVA_OPTS (
set _JAVA_OPTS=!_JAVA_OPTS! %%A
) else (
set _JAVA_OPTS=%%A
)
)
)
rem We use the value of the JAVA_OPTS environment variable if defined, rather than the config. rem users can set JAVA_OPTS via .jvmopts (sbt-extras style)
if not defined _JAVA_OPTS if defined JAVA_OPTS set _JAVA_OPTS=%JAVA_OPTS% if exist .jvmopts for /F %%A in (.jvmopts) do (
set _jvmopts_line=%%A
if not "!_jvmopts_line:~0,1!" == "#" (
if defined _JAVA_OPTS (
set _JAVA_OPTS=!_JAVA_OPTS! %%A
) else (
set _JAVA_OPTS=%%A
)
)
)
rem If nothing is defined, use the defaults.
if not defined _JAVA_OPTS if defined default_java_opts set _JAVA_OPTS=!default_java_opts! if not defined _JAVA_OPTS if defined default_java_opts set _JAVA_OPTS=!default_java_opts!
rem We use the value of the SBT_OPTS environment variable if defined, rather than the config. rem We use the value of the SBT_OPTS environment variable if defined, rather than the config.