From 9096fb83489e293d4b9b18ab9825cb740c420bb8 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Sun, 8 Nov 2015 21:27:38 -0800
Subject: [PATCH] --resolve fixes.

---
 src/main/kotlin/com/beust/kobalt/Main.kt                 | 8 ++++----
 src/main/kotlin/com/beust/kobalt/maven/UnversionedDep.kt | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt
index ad055b98..9b27a30f 100644
--- a/src/main/kotlin/com/beust/kobalt/Main.kt
+++ b/src/main/kotlin/com/beust/kobalt/Main.kt
@@ -145,9 +145,6 @@ private class Main @Inject constructor(
             jc.usage()
         } else if (args.serverMode) {
             server.run()
-        } else if (args.dependency != null) {
-            // --resolve
-            resolveDependency.run(args.dependency as String)
         } else {
             if (! buildFile.exists()) {
                 error(buildFile.path.toFile().path + " does not exist")
@@ -162,7 +159,10 @@ private class Main @Inject constructor(
 
                 log(2, "Final list of repos:\n  " + Kobalt.repos.joinToString("\n  "))
 
-                if (args.tasks) {
+                if (args.dependency != null) {
+                    // --resolve
+                    resolveDependency.run(args.dependency as String)
+                } else if (args.tasks) {
                     //
                     // List of tasks
                     //
diff --git a/src/main/kotlin/com/beust/kobalt/maven/UnversionedDep.kt b/src/main/kotlin/com/beust/kobalt/maven/UnversionedDep.kt
index 740f7e71..a817007a 100644
--- a/src/main/kotlin/com/beust/kobalt/maven/UnversionedDep.kt
+++ b/src/main/kotlin/com/beust/kobalt/maven/UnversionedDep.kt
@@ -19,6 +19,7 @@ open public class UnversionedDep(open val groupId: String, open val artifactId:
     public fun toDirectory(v: String, fileSystem: Boolean = true): String {
         val sep = if (fileSystem) File.separator else "/"
         val l = listOf(groupId.replace(".", sep), artifactId, v)
-        return Strings.Companion.join(sep, l)
+        val result = Strings.Companion.join(sep, l)
+        return if (result.endsWith("/")) result else result + "/"
     }
 }