erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-25 07:57:12 -07:00
Code Releases Activity

Merge branch 'master' of github.com:cbeust/kobalt

Browse source
This commit is contained in:
Cedric Beust 2018-01-26 23:59:54 -08:00
commit 7a2c4f34da
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt
View file

@ -101,5 +101,8 @@ class Args {
@Parameter(names = arrayOf("--update"), description = "Update to the latest version of Kobalt")
var update: Boolean = false
@Parameter(names = arrayOf("--version"), description = "Display the current version of Kobalt")
var version: Boolean = false
}

4
modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
View file

@ -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) {

8
src/main/kotlin/com/beust/kobalt/Main.kt
View file

@ -38,6 +38,14 @@ class Main @Inject constructor(
companion object {
fun mainNoExit(argv: Array<String>): Int {
val (jc, args) = parseArgs(argv)
if (args.usage) {
jc.usage()
return 0
}
if (args.version) {
println("Kobalt ${Kobalt.version}")
return 0
}
Kobalt.init(MainModule(args, KobaltSettings.readSettingsXml()))
val result = launchMain(Kobalt.INJECTOR.getInstance(Main::class.java), jc, args, argv)
return result