From 41ba68c630a43e79a39c3d5ac31863c63a6a1d75 Mon Sep 17 00:00:00 2001
From: "Erik C. Thauvin" <erik@thauvin.net>
Date: Sat, 20 Jan 2018 16:15:31 -0800
Subject: [PATCH] No longer create directories, etc. when --help or --version
 are used.

---
 .../wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java  | 4 ++--
 src/main/kotlin/com/beust/kobalt/Main.kt                      | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
index f57db6d2..40e21ea5 100644
--- a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
+++ b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
@@ -47,7 +47,6 @@ public class Main {
 
     private int installAndLaunchMain(String[] argv) throws IOException, InterruptedException {
         String version = getVersion();
-        initWrapperFile(version);
 
         List<String> kobaltArgv = new ArrayList<>();
         boolean noLaunch = false;
@@ -78,6 +77,7 @@ public class Main {
         }
         int result = 0;
         if (! exit) {
+            initWrapperFile(version);
             Path kobaltJarFile = installDistribution();
             if (!noLaunch) {
                 result = launchMain(kobaltJarFile, kobaltArgv);
@@ -133,7 +133,7 @@ public class Main {
     }
 
     private String getWrapperVersion() {
-        return wrapperProperties.getProperty(PROPERTY_VERSION);
+        return wrapperProperties.getProperty(PROPERTY_VERSION, "N/A");
     }
 
     private String getWrapperDownloadUrl(String version) {
diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt
index aeedb001..e8040ac0 100644
--- a/src/main/kotlin/com/beust/kobalt/Main.kt
+++ b/src/main/kotlin/com/beust/kobalt/Main.kt
@@ -38,6 +38,10 @@ class Main @Inject constructor(
     companion object {
         fun mainNoExit(argv: Array<String>): Int {
             val (jc, args) = parseArgs(argv)
+            if (args.usage) {
+                jc.usage()
+                return 0
+            }
             Kobalt.init(MainModule(args, KobaltSettings.readSettingsXml()))
             val result = launchMain(Kobalt.INJECTOR.getInstance(Main::class.java), jc, args, argv)
             return result