From 044bcc9c48973e787e7192eae7bdee991739819a Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Fri, 13 Nov 2015 23:36:58 -0800 Subject: [PATCH] Don't expose downloadUrl since it doesn't work yet. --- .../src/main/java/com/beust/kobalt/wrapper/Main.java | 3 ++- .../kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt | 6 +++--- src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt | 2 +- 3 files changed, 6 insertions(+), 5 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 d5914dec..89d1d418 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 @@ -86,7 +86,8 @@ public class Main { if (! config.exists()) { saveFile(config, PROPERTY_VERSION + "=" + version + "\n" - + PROPERTY_DOWNLOAD_URL + "=" + downloadUrl(version) + "\n"); +// + PROPERTY_DOWNLOAD_URL + "=" + downloadUrl(version) + "\n" + ); } wrapperProperties.load(new FileReader(config)); } diff --git a/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt b/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt index 80fcc72a..8af0da44 100644 --- a/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt +++ b/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt @@ -18,13 +18,13 @@ class KobaltWrapperProperties @Inject constructor() { fun create(version: String) { log(2, "Creating $file with $version and ${defaultUrlFor(version)}") KFiles.saveFile(file, listOf( - "$PROPERTY_VERSION=$version", - "$PROPERTY_DOWNLOAD_URL=${defaultUrlFor(version)}" + "$PROPERTY_VERSION=$version" +// "$PROPERTY_DOWNLOAD_URL=${defaultUrlFor(version)}" ).joinToString("\n")) } private fun defaultUrlFor(version: String) = - "https://github.com/cbeust/kobalt/releases/download/$version/kobalt-$version.zip" + "http://beust.com/kobalt/kobalt-$version.zip" private val file: File get() = File("$WRAPPER_DIR/$KOBALT_WRAPPER_PROPERTIES") diff --git a/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt b/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt index 08dba92a..6b8a7cde 100644 --- a/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt +++ b/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt @@ -16,6 +16,6 @@ public class UpdateKobalt @Inject constructor(val github: GithubApi, val wrapper * Download from the URL found in the kobalt-wrapper.properties regardless of what the latest version is */ fun downloadKobalt() { - com.beust.kobalt.wrapper.Main.main(arrayOf("--download")) + com.beust.kobalt.wrapper.Main.main(arrayOf("--download", "--no-launch")) } }