From e6fc5a349d5fff8d7e11ef29239250dc4d279784 Mon Sep 17 00:00:00 2001 From: idk Date: Wed, 7 Sep 2022 12:29:54 -0400 Subject: [PATCH] when launching into a router console disable the proxy timeout --- config.sh | 17 +++++++++++------ java/net/i2p/router/WinLauncher.java | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/config.sh b/config.sh index 4256ea4..17cac18 100755 --- a/config.sh +++ b/config.sh @@ -9,10 +9,13 @@ ## Other potential values(NOT exhaustive): -PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/" -export PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/" -JAVA_HOME="/c/Program Files/Java/jdk-18.0.2" -export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2" +uname=$(uname) +if "${uname}" != "Linux"; then + PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/" + export PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/" + JAVA_HOME="/c/Program Files/Java/jdk-18.0.2" + export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2" +fi #export PATH="$PATH:/c/Program Files/Eclipse Adoptium/jdk-17.0.3/bin/" #export JAVA_HOME="/c/Program Files/Eclipse Adoptium/jdk-17.0.3" #export PATH="$PATH:/c/Program Files/OpenJDK/jdk-17.0.3/bin/" @@ -50,5 +53,7 @@ export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2" #export PATH="$PATH:$ANT_HOME/bin/" # Uncomment this to add signtool to the path so you don't have to fight with Visual Studio. -PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/" -export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/" +if "${uname}" != "Linux"; then + PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/" + export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/" +fi \ No newline at end of file diff --git a/java/net/i2p/router/WinLauncher.java b/java/net/i2p/router/WinLauncher.java index 6c9d7e6..de64ac8 100644 --- a/java/net/i2p/router/WinLauncher.java +++ b/java/net/i2p/router/WinLauncher.java @@ -123,7 +123,7 @@ public class WinLauncher { i2pBrowser.chromiumFirst = chromiumFirst; i2pBrowser.firefox = !chromiumFirst; i2pBrowser.chromium = chromiumFirst; - i2pbrowser.setProxyTimeoutTime(proxyTimeoutTime); + i2pBrowser.setProxyTimeoutTime(proxyTimeoutTime); System.out.println("I2PBrowser"); String[] newArgs = newArgsList.toArray(new String[newArgsList.size()]); i2pBrowser.launch(privateBrowsing, newArgs);