Fix a bug in constructing the path for running

Because (+) is overloaded, we were accidentally adding the segments of the built jar file's path to the claspath, rather than the full path.
cjfuller · Jan 2, 2022 · a785015 · a785015
1 parent 93e1c5c
commit a785015
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/commands/Run.kt b/src/commands/Run.kt
@@ -23,7 +23,7 @@ class Run(val script: Path?, val runArgs: List<String>) : Runnable {
 
             Subprocess.new {
                 command = "java"
-                addArgs("-cp", (Config.global.depsJarFiles() + KotlinC.outputJar()).toClasspathString())
+                addArgs("-cp", (Config.global.depsJarFiles() + listOf(KotlinC.outputJar())).toClasspathString())
                 arg(mainClass)
                 addArgs(*runArgs.toTypedArray())
             }.getOrThrow().run_check()

diff --git a/src/tools/KotlinC.kt b/src/tools/KotlinC.kt
@@ -40,7 +40,7 @@ object KotlinC : ToolZipBundle<KotlinCBundle> {
         Subprocess.new {
             command = path(KotlinCBundle.KOTLINC).absolutePathString()
             addArgs("-script", script.absolutePathString())
-            addArgs("-cp", (Config.global.depsJarFiles() + outputJar()).toClasspathString())
+            addArgs("-cp", (Config.global.depsJarFiles() + listOf(outputJar())).toClasspathString())
             if (Config.global.useSerializationPlugin) {
                 arg("-Xplugin=${path(KotlinCBundle.SER_PLUGIN).absolutePathString()}")
             }