From 5b7a8e31d04291d9b0ccda96b4a533b4d12d1202 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 15 May 2015 19:05:23 +0200 Subject: [PATCH] Make regtest and localhost default for bootstrap node --- .../java/io/bitsquare/app/bootstrap/BootstrapNode.java | 4 ++-- .../java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java | 4 ++-- package/linux/create_app.sh | 7 +------ package/windows/Bitsquare.iss | 2 +- package/windows/create_app.bat | 2 +- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java index 96ec85e448..0afd70e990 100644 --- a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java +++ b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNode.java @@ -45,7 +45,7 @@ public class BootstrapNode { private static final String VERSION = "0.1.3"; public static final String P2P_ID = "node.p2pId"; - public static int DEFAULT_P2P_ID = 1; // 0 | 1 | 2 for mainnet/testnet/regtest + public static int DEFAULT_P2P_ID = 2; // 0 | 1 | 2 for mainnet/testnet/regtest private static Peer peer = null; @@ -60,7 +60,7 @@ public class BootstrapNode { public void start() { int p2pId = env.getProperty(P2P_ID, Integer.class, DEFAULT_P2P_ID); int port = env.getProperty(Node.PORT_KEY, Integer.class, BootstrapNodes.BASE_PORT + p2pId); - String name = env.getRequiredProperty(Node.NAME_KEY); + String name = env.getProperty(Node.NAME_KEY, BootstrapNodes.LOCALHOST.getName()); Logging.setup(name + "_" + port); try { diff --git a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java index dc06c754e1..64a8c9039f 100644 --- a/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java +++ b/bootstrap/src/main/java/io/bitsquare/app/bootstrap/BootstrapNodeMain.java @@ -32,9 +32,9 @@ public class BootstrapNodeMain extends BitsquareExecutable { } protected void customizeOptionParsing(OptionParser parser) { - parser.accepts(Node.NAME_KEY, description("Name of this node", null)) + parser.accepts(Node.NAME_KEY, description("Name of this node", BootstrapNodes.LOCALHOST.getName())) .withRequiredArg() - .isRequired(); + .ofType(String.class); parser.accepts(Node.PORT_KEY, description("Port to listen on", BootstrapNodes.BASE_PORT)) .withRequiredArg() .ofType(int.class); diff --git a/package/linux/create_app.sh b/package/linux/create_app.sh index 7ef7c514e2..efaf12805b 100644 --- a/package/linux/create_app.sh +++ b/package/linux/create_app.sh @@ -27,9 +27,4 @@ $JAVA_HOME/bin/javapackager \ -appclass io.bitsquare.app.BitsquareAppMain \ -outfile Bitsquare -cd package/linux - -# TODO: Figure out where LICENSE file goes so distros don't complain about "low quality" packages. -# -BlicenseFile=LICENSE comlains about missing file (Bundler DEB Installer skipped because of a configuration problem: Specified license file is missing. -# Advice to fix: Make sure that references a file in the app resources, and that it is relative to the -# basedir.) +cd package/linux \ No newline at end of file diff --git a/package/windows/Bitsquare.iss b/package/windows/Bitsquare.iss index b154f82812..802d97ba14 100755 --- a/package/windows/Bitsquare.iss +++ b/package/windows/Bitsquare.iss @@ -3,7 +3,7 @@ [Setup] AppId={{bitsquare}} AppName=Bitsquare -AppVersion=0.1.1 +AppVersion=0.2.1 AppVerName=Bitsquare AppPublisher=Bitsquare AppComments=Bitsquare diff --git a/package/windows/create_app.bat b/package/windows/create_app.bat index 39fff4573c..ec4435b598 100644 --- a/package/windows/create_app.bat +++ b/package/windows/create_app.bat @@ -1,6 +1,6 @@ cd ..\..\ -:: edit iss file -> AppVersion=0.1.1 +:: edit iss file -> AppVersion=0.2.1 :: Copy jar file from mac build (1.jar from processed folder) to windows :: edit -> -BappVersion=0.2.1 and -srcfiles