From 615818976a45a12167d8b86e061a35d7d2d74c4d Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Wed, 7 Sep 2022 12:34:19 -0400
Subject: [PATCH] add safety checks around Windows config stuff

---
 config.sh                            | 17 +++++++++++++++--
 java/net/i2p/router/WinLauncher.java |  3 ++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/config.sh b/config.sh
index 17cac18..b6074ef 100755
--- a/config.sh
+++ b/config.sh
@@ -3,19 +3,28 @@
 ## If you need to use a different JVM, JDK, or other utility from
 # build.sh, set it in this file, for example:
 
+uname=$(uname)
+
 #export PATH="$PATH:/c/Program Files/Java/jdk-17.0.3/bin/"
 #export JAVA_HOME="/c/Program Files/Java/jdk-17.0.3"
 # to use it for Oracle OpenJDK17
 
 ## Other potential values(NOT exhaustive):
 
-uname=$(uname)
+if grep -qEi "(Microsoft|WSL)" /proc/version &> /dev/null ; 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
+
 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/"
@@ -52,7 +61,11 @@ fi
 #export ANT_HOME="/c/apache-ant-1.10.9"
 #export PATH="$PATH:$ANT_HOME/bin/"
 
-# Uncomment this to add signtool to the path so you don't have to fight with Visual Studio.
+if grep -qEi "(Microsoft|WSL)" /proc/version &> /dev/null ; 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
+
 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/"
diff --git a/java/net/i2p/router/WinLauncher.java b/java/net/i2p/router/WinLauncher.java
index de64ac8..8c55273 100644
--- a/java/net/i2p/router/WinLauncher.java
+++ b/java/net/i2p/router/WinLauncher.java
@@ -73,7 +73,8 @@ public class WinLauncher {
             logger.info("Proxy timeout time set to zero");
           } else {
             // make an effort to not let people launch into sites if the proxy
-            // isn't quite ready yet
+            // isn't quite ready yet, but also disable the proxy timeout if
+            // they're reaching a router console
             if (arg.startsWith("http://localhost:76")) {
               newArgsList.add(arg);
               proxyTimeoutTime = 0;