From 3b39ff0554546bf9fe030f85b6376a9a325486d1 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 8 Jan 2018 09:08:12 -0500
Subject: [PATCH 1/2] Use more delayed expansion

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.
```
---
 citest/test.bat           | 2 ++
 src/universal/bin/sbt.bat | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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"

From 417599b4634fe6a64e389a672771e9d72713a030 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Mon, 8 Jan 2018 10:17:38 -0500
Subject: [PATCH 2/2] Fixing test

---
 citest/build.sbt | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/citest/build.sbt b/citest/build.sbt
index 81b1532b6..3ff4eae20 100644
--- a/citest/build.sbt
+++ b/citest/build.sbt
@@ -16,12 +16,9 @@ lazy val root = (project in file("."))
       assert(xs(4) startsWith "[info] The current project")
       assert(xs(5) startsWith "[info] The current project is built against Scala 2.12.4")
 
-      val ys = IO.readLines(file("err.txt")).toVector
+      val ys = IO.readLines(file("err.txt")).toVector.distinct
 
-      println(ys)
-
-      assert(ys.size == 2)
+      assert(ys.size == 1, s"ys has more than one item: $ys")
       assert(ys(0) startsWith "Java HotSpot(TM) 64-Bit Server VM warning")
-      assert(ys(1) startsWith "Java HotSpot(TM) 64-Bit Server VM warning")
     }
   )