feature: longer timeout for Github Actions

cleanup: small changes and improvements

Author: aartiPl

.github/workflows/build.yml

@@ -17,6 +17,7 @@ jobs:
           # macos-10.15
           - windows-2022
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
 #    defaults:
 #      run:
 #        shell: bash
@@ -105,6 +106,7 @@ jobs:
           echo "${PWD}" >> $GITHUB_PATH
 
       - name: Run tests
+        timeout-minutes: 10
         shell: bash
         if: ${{ runner.os != 'Windows' }}
         run: |

src/main/kotlin/kscript/app/KscriptHandler.kt

@@ -9,6 +9,7 @@ import kscript.app.parser.Parser
 import kscript.app.resolver.*
 import kscript.app.util.Executor
 import kscript.app.util.Logger
+import kscript.app.util.Logger.devMsg
 import kscript.app.util.Logger.infoMsg
 import org.docopt.DocOptWrapper
 import java.net.URI
@@ -20,6 +21,9 @@ class KscriptHandler(private val config: Config, private val docopt: DocOptWrapp
         Logger.silentMode = docopt.getBoolean("silent")
         Logger.devMode = docopt.getBoolean("development")
 
+        devMsg("KScript configuration:")
+        devMsg(config.toString())
+
         // create kscript dir if it does not yet exist
         val appDir = AppDir(config.kscriptDir)
 

src/main/kotlin/kscript/app/code/Templates.kt

@@ -114,7 +114,7 @@ object Templates {
          --add-bootstrap-header  Prepend bash header that installs kscript if necessary
 
 
-        Copyright : 2021 Holger Brandl
+        Copyright : 2022 Holger Brandl
         License   : MIT
         Version   : v${version}
         Website   : https://github.com/holgerbrandl/kscript

src/main/kotlin/kscript/app/model/Config.kt

@@ -17,8 +17,6 @@ data class Config(
     val repositoryUserEnvVariable: String,
     val repositoryPasswordEnvVariable: String,
 ) {
-
-
     companion object {
         fun builder() = ConfigBuilder()
     }

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

@@ -36,7 +36,7 @@ class CommandResolver(private val config: Config, private val script: Script) {
 
         val classpath = resolveClasspath(dependenciesSet)
 
-        val kotlin = if (config.kotlinHome != null) (config.kotlinHome / "bin" / "kotlin").toString() else "kotlin"
+        val kotlin = if (config.kotlinHome != null) (config.kotlinHome / "bin" / "kotlin").absolutePathString() else "kotlin"
 
         return "$kotlin $kotlinOptsStr $classpath ${jarArtifact.execClassName} $userArgsStr"
     }
@@ -46,7 +46,7 @@ class CommandResolver(private val config: Config, private val script: Script) {
         val kotlinOptsStr = resolveKotlinOpts(script.kotlinOpts)
         val classpath = resolveClasspath(dependencies)
 
-        val kotlinc = if (config.kotlinHome != null) (config.kotlinHome / "bin" / "kotlinc").toString() else "kotlinc"
+        val kotlinc = if (config.kotlinHome != null) (config.kotlinHome / "bin" / "kotlinc").absolutePathString() else "kotlinc"
 
         return "$kotlinc $compilerOptsStr $kotlinOptsStr $classpath"
     }

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

@@ -10,7 +10,7 @@ object ShellUtils {
 
     fun isInPath(tool: String) = evalBash("which $tool").stdout.trim().isNotBlank()
 
-    /** see discussion on https://github.com/holgerbrandl/kscript/issues/15*/
+    // see discussion on https://github.com/holgerbrandl/kscript/issues/15
     fun guessKotlinHome(): String? {
         val kotlinHome = evalBash("KOTLIN_RUNNER=1 JAVACMD=echo kotlinc").stdout.run {
             "kotlin.home=([^\\s]*)".toRegex().find(this)?.groups?.get(1)?.value