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

No longer create directories, etc. when --help or --version are used.

Browse source
This commit is contained in:
Erik C. Thauvin 2018-01-20 16:15:31 -08:00
parent 18c6f38948
commit 41ba68c630
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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 { private int installAndLaunchMain(String[] argv) throws IOException, InterruptedException {
String version = getVersion(); String version = getVersion();
initWrapperFile(version);
List<String> kobaltArgv = new ArrayList<>(); List<String> kobaltArgv = new ArrayList<>();
boolean noLaunch = false; boolean noLaunch = false;
@ -78,6 +77,7 @@ public class Main {
} }
int result = 0; int result = 0;
if (! exit) { if (! exit) {
initWrapperFile(version);
Path kobaltJarFile = installDistribution(); Path kobaltJarFile = installDistribution();
if (!noLaunch) { if (!noLaunch) {
result = launchMain(kobaltJarFile, kobaltArgv); result = launchMain(kobaltJarFile, kobaltArgv);
@ -133,7 +133,7 @@ public class Main {
} }
private String getWrapperVersion() { private String getWrapperVersion() {
return wrapperProperties.getProperty(PROPERTY_VERSION); return wrapperProperties.getProperty(PROPERTY_VERSION, "N/A");
} }
private String getWrapperDownloadUrl(String version) { private String getWrapperDownloadUrl(String version) {

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

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