luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-08-22 06:07:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use more delayed expansion

Browse Source 
Fixes #206

When I use unzipped sbt.bat it seems to runs ok, but using the msi installer version, this variable seems to expand and causes:

```
\sbt\bin\java9-rt-export.jar was unexpected at this time.
```
This commit is contained in:
Eugene Yokota
2018-01-08 10:06:04 -05:00
parent a8b7b5a060
commit 3b39ff0554
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
citest/test.bat
+2
View File
@@ -7,6 +7,8 @@ unzip ..\target\universal\sbt.zip -d freshly-baked
SETLOCAL SETLOCAL
"freshly-baked\sbt\bin\sbt" about
SET JAVA_HOME=C:\jdk9 SET JAVA_HOME=C:\jdk9
SET PATH=C:\jdk9\bin;%PATH% SET PATH=C:\jdk9\bin;%PATH%
SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8 SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8
src/universal/bin/sbt.bat
+1 -1
View File
@@ -129,7 +129,7 @@ exit /B 1
:copyrt :copyrt
if /I "%JAVA_VERSION%" GEQ "9" ( if /I "%JAVA_VERSION%" GEQ "9" (
set rtexport=%SBT_HOME%java9-rt-export.jar set rtexport=!SBT_HOME!java9-rt-export.jar
"%_JAVACMD%" %_JAVA_OPTS% %SBT_OPTS% -jar "!rtexport!" --rt-ext-dir > "%TEMP%.\rtext.txt" "%_JAVACMD%" %_JAVA_OPTS% %SBT_OPTS% -jar "!rtexport!" --rt-ext-dir > "%TEMP%.\rtext.txt"
set /p java9_ext= < "%TEMP%.\rtext.txt" set /p java9_ext= < "%TEMP%.\rtext.txt"