diff --git a/bin/build-launcher.sh b/bin/build-launcher.sh index 095c3fa..6ff72ac 100755 --- a/bin/build-launcher.sh +++ b/bin/build-launcher.sh @@ -39,8 +39,8 @@ for i in linux mac win; do JAVA_HOME_VARIANT=${JAVA_HOME_WIN} ;; esac echo "Using JAVA_HOME_VARIANT: $JAVA_HOME_VARIANT" - $JAVA_HOME/bin/jlink --module-path ${JAVA_HOME_VARIANT}/jmods:target/modules:target/org.getmonero.i2p.zero.jar --add-modules org.getmonero.i2p.zero --output dist/$i/router --strip-debug --compress 2 --no-header-files --no-man-pages - $JAVA_HOME/bin/jlink --module-path ${JAVA_HOME_VARIANT}/jmods:import/javafx-jmods/$i/javafx-jmods-${JAVAFX_VERSION}:target/modules:target/org.getmonero.i2p.zero.jar:target/org.getmonero.i2p.zero.gui.jar --add-modules org.getmonero.i2p.zero,org.getmonero.i2p.zero.gui,javafx.controls,javafx.fxml,java.desktop --output dist/$i-gui/router --strip-debug --compress 2 --no-header-files --no-man-pages + $JAVA_HOME/bin/jlink --module-path ${JAVA_HOME_VARIANT}/jmods:target/modules:target/org.getmonero.i2p.zero.jar --add-modules org.getmonero.i2p.zero --output dist/$i/router --compress 2 --no-header-files --no-man-pages + $JAVA_HOME/bin/jlink --module-path ${JAVA_HOME_VARIANT}/jmods:import/javafx-jmods/$i/javafx-jmods-${JAVAFX_VERSION}:target/modules:target/org.getmonero.i2p.zero.jar:target/org.getmonero.i2p.zero.gui.jar --add-modules org.getmonero.i2p.zero,org.getmonero.i2p.zero.gui,javafx.controls,javafx.fxml,java.desktop --output dist/$i-gui/router --compress 2 --no-header-files --no-man-pages done for i in linux mac linux-gui mac-gui; do diff --git a/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java b/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java index e428e5e..19c13ce 100644 --- a/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java +++ b/org.getmonero.i2p.zero.gui/src/org/getmonero/i2p/zero/gui/Controller.java @@ -198,14 +198,13 @@ public class Controller { private void startRouter() { - // need to launch Gui with parameters: --i2p.dir.base= and --i2p.dir.config= - var params = Gui.instance.getParameters().getNamed(); Properties routerProperties = new Properties(); routerProperties.put("i2np.inboundKBytesPerSecond", getBandwidthLimitKBPerSec()); routerProperties.put("i2np.outboundKBytesPerSecond", getBandwidthLimitKBPerSec()); routerProperties.put("router.sharePercentage", 80); + params.entrySet().stream().forEach(e->routerProperties.put(e.getKey(), e.getValue())); routerWrapper = new RouterWrapper(routerProperties); routerWrapper.start();