Infer kotlin and kotlinc binaries via KOTLIN_HOME when being set

Author: holgerbrandl

src/main/kotlin/kscript/app/resolver/CommandResolver.kt

@@ -9,14 +9,17 @@ import java.nio.file.Path
 import java.nio.file.Paths
 import kotlin.io.path.absolute
 import kotlin.io.path.absolutePathString
+import kotlin.io.path.div
 
 class CommandResolver(private val config: Config, private val script: Script) {
     fun compileKotlin(jar: Path, dependencies: Set<Path>, filePaths: Set<Path>): String {
         val compilerOptsStr = resolveCompilerOpts(script.compilerOpts)
         val classpath = resolveClasspath(dependencies)
         val files = filePaths.joinToString(" ") { it.absolute().toString() }
 
-        return "kotlinc $compilerOptsStr $classpath -d '${jar.absolute()}' $files"
+        val kotlinc = if (config.kotlinHome != null) (config.kotlinHome / "bin" / "kotlinc").toString() else "kotlinc"
+
+        return "$kotlinc $compilerOptsStr $classpath -d '${jar.absolute()}' $files"
     }
 
     fun executeKotlin(jarArtifact: JarArtifact, dependencies: Set<Path>, userArgs: List<String>): String {
@@ -33,15 +36,19 @@ class CommandResolver(private val config: Config, private val script: Script) {
 
         val classpath = resolveClasspath(dependenciesSet)
 
-        return "kotlin $kotlinOptsStr $classpath ${jarArtifact.execClassName} $userArgsStr"
+        val kotlin = if (config.kotlinHome != null) (config.kotlinHome / "bin" / "kotlin").toString() else "kotlin"
+
+        return "$kotlin $kotlinOptsStr $classpath ${jarArtifact.execClassName} $userArgsStr"
     }
 
     fun interactiveKotlinRepl(dependencies: Set<Path>): String {
         val compilerOptsStr = resolveCompilerOpts(script.compilerOpts)
         val kotlinOptsStr = resolveKotlinOpts(script.kotlinOpts)
         val classpath = resolveClasspath(dependencies)
 
-        return "kotlinc $compilerOptsStr $kotlinOptsStr $classpath"
+        val kotlinc = if (config.kotlinHome != null) (config.kotlinHome / "bin" / "kotlinc").toString() else "kotlinc"
+
+        return "$kotlinc $compilerOptsStr $kotlinOptsStr $classpath"
     }
 
     fun executeIdea(projectPath: Path): String {

src/main/kotlin/kscript/app/util/Executor.kt

@@ -5,10 +5,11 @@ import kscript.app.model.Config
 import kscript.app.resolver.CommandResolver
 import kscript.app.util.Logger.devMsg
 import java.nio.file.Path
+import kotlin.io.path.div
 
 class Executor(private val commandResolver: CommandResolver, private val config: Config) {
     fun compileKotlin(jar: Path, dependencies: Set<Path>, filePaths: Set<Path>) {
-        if (!ShellUtils.isInPath("kotlinc")) {
+        if (config.kotlinHome == null && !ShellUtils.isInPath("kotlinc")) {
             throw IllegalStateException("${"kotlinc"} is not in PATH")
         }
 
@@ -24,8 +25,8 @@ class Executor(private val commandResolver: CommandResolver, private val config:
     }
 
     fun executeKotlin(jarArtifact: JarArtifact, dependencies: Set<Path>, userArgs: List<String>) {
-        if (config.kotlinHome == null) {
-            throw IllegalStateException("KOTLIN_HOME is not set and could not be inferred from context")
+        if (config.kotlinHome == null && !ShellUtils.isInPath("kotlin") ) {
+            throw IllegalStateException("KOTLIN_HOME is not set and could not be inferred from context, and kotlin is not in PATH")
         }
 
         val command = commandResolver.executeKotlin(jarArtifact, dependencies, userArgs)