diff --git a/citest/test.bat b/citest/test.bat index 609959707..7d35a6ca6 100644 --- a/citest/test.bat +++ b/citest/test.bat @@ -7,6 +7,8 @@ unzip ..\target\universal\sbt.zip -d freshly-baked SETLOCAL +"freshly-baked\sbt\bin\sbt" about + SET JAVA_HOME=C:\jdk9 SET PATH=C:\jdk9\bin;%PATH% SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8 diff --git a/src/universal/bin/sbt.bat b/src/universal/bin/sbt.bat index 4384c7286..4e966daac 100644 --- a/src/universal/bin/sbt.bat +++ b/src/universal/bin/sbt.bat @@ -129,7 +129,7 @@ exit /B 1 :copyrt 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" set /p java9_ext= < "%TEMP%.\rtext.txt"