prefer 'eager' style

2 files changed, 5 insertions, 14 deletions

diff --git a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
index 4dc8b7d9..82c3efe1 100644
--- a/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
+++ b/nexus/src/main/kotlin/tech/libeufin/nexus/Main.kt
@@ -36,6 +36,7 @@ import com.github.ajalt.clikt.core.*
 import com.github.ajalt.clikt.parameters.options.versionOption
 import tech.libeufin.nexus.iso20022.parseCamtMessage
 import tech.libeufin.util.XMLUtil
+import tech.libeufin.util.getVersion
 import tech.libeufin.util.setLogLevel
 import java.io.File
 
@@ -46,7 +47,7 @@ const val DEFAULT_DB_CONNECTION = "jdbc:sqlite:/tmp/libeufin-nexus.sqlite3"
 class NexusCommand : CliktCommand() {
     init {
         // FIXME: Obtain actual version number!
-        versionOption("DEVELOPMENT")
+        versionOption(getVersion())
     }
     override fun run() = Unit
 }
diff --git a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
index 7719c5c3..8c93f4a1 100644
--- a/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
+++ b/sandbox/src/main/kotlin/tech/libeufin/sandbox/Main.kt
@@ -62,6 +62,7 @@ import com.github.ajalt.clikt.output.CliktHelpFormatter
 import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.flag
 import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.parameters.options.versionOption
 import com.github.ajalt.clikt.parameters.types.int
 import execThrowableOrTerminate
 import io.ktor.request.*
@@ -193,20 +194,9 @@ fun ensureNonNull(param: String?): String {
 
 class SandboxCommand : CliktCommand(invokeWithoutSubcommand = true, printHelpOnEmptyArgs = true) {
     init {
-        context {
-            helpFormatter = CliktHelpFormatter(showDefaultValues = true)
-        }
-    }
-    private val version by option().flag()
-    override fun run() {
-        if (version) {
-            println(getVersion())
-            exitProcess(0)
-        }
-        if (currentContext.invokedSubcommand == null) {
-            println("Caught you: no command was run")
-        }
+        versionOption(getVersion())
     }
+    override fun run() = Unit
 }