From aa3fc929cbfe538d32874c27e9e0fb54fafe93ee Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Thu, 27 Nov 2014 10:04:48 +0100 Subject: [PATCH] Accept `--clean=true` as a shortcut for `--app.data.dir.clean=true` See #291 --- src/main/java/io/bitsquare/app/gui/BitsquareApp.java | 4 +++- src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/bitsquare/app/gui/BitsquareApp.java b/src/main/java/io/bitsquare/app/gui/BitsquareApp.java index 928817f4a5..fd2681d80c 100644 --- a/src/main/java/io/bitsquare/app/gui/BitsquareApp.java +++ b/src/main/java/io/bitsquare/app/gui/BitsquareApp.java @@ -79,7 +79,9 @@ public class BitsquareApp extends Application { // initialize the application data directory (if necessary) - initAppDir(env.getRequiredProperty(APP_DATA_DIR_KEY), env.getProperty(APP_DATA_DIR_CLEAN_KEY, boolean.class)); + initAppDir( + env.getRequiredProperty(APP_DATA_DIR_KEY), + env.getRequiredProperty(APP_DATA_DIR_CLEAN_KEY, boolean.class)); // load and apply any stored settings diff --git a/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java b/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java index 6a9560a778..8d71b1ad30 100644 --- a/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java +++ b/src/main/java/io/bitsquare/app/gui/BitsquareAppMain.java @@ -30,6 +30,7 @@ import joptsimple.OptionSet; import static io.bitsquare.app.BitsquareEnvironment.*; import static io.bitsquare.msg.tomp2p.TomP2PMessageModule.*; import static io.bitsquare.network.Node.*; +import static java.util.Arrays.asList; public class BitsquareAppMain extends BitsquareExecutable { @@ -45,7 +46,8 @@ public class BitsquareAppMain extends BitsquareExecutable { .withRequiredArg(); parser.accepts(APP_DATA_DIR_KEY, description("Application data directory", DEFAULT_APP_DATA_DIR)) .withRequiredArg(); - parser.accepts(APP_DATA_DIR_CLEAN_KEY, description("Clean application data dir", DEFAULT_APP_DATA_DIR_CLEAN)) + parser.acceptsAll(asList(APP_DATA_DIR_CLEAN_KEY, "clean"), + description("Clean application data directory", DEFAULT_APP_DATA_DIR_CLEAN)) .withRequiredArg() .ofType(boolean.class); parser.accepts(NAME_KEY, description("Name of this node", null))