I2P_Developers/i2p.firefox
3
0
Fork 1
Code Issues 14 Pull Requests Packages Projects Releases Wiki Activity

add safety checks around Windows config stuff

Browse Source
This commit is contained in:
idk
2022-09-07 12:34:19 -04:00
parent e6fc5a349d
commit 615818976a
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
config.sh
View File

@@ -3,19 +3,28 @@
## If you need to use a different JVM, JDK, or other utility from ## If you need to use a different JVM, JDK, or other utility from
# build.sh, set it in this file, for example: # build.sh, set it in this file, for example:
uname=$(uname)
#export PATH="$PATH:/c/Program Files/Java/jdk-17.0.3/bin/" #export PATH="$PATH:/c/Program Files/Java/jdk-17.0.3/bin/"
#export JAVA_HOME="/c/Program Files/Java/jdk-17.0.3" #export JAVA_HOME="/c/Program Files/Java/jdk-17.0.3"
# to use it for Oracle OpenJDK17 # to use it for Oracle OpenJDK17
## Other potential values(NOT exhaustive): ## 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 if "${uname}" != "Linux"; then
PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/" 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/" 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" JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2" export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
fi fi
#export PATH="$PATH:/c/Program Files/Eclipse Adoptium/jdk-17.0.3/bin/" #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 JAVA_HOME="/c/Program Files/Eclipse Adoptium/jdk-17.0.3"
#export PATH="$PATH:/c/Program Files/OpenJDK/jdk-17.0.3/bin/" #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 ANT_HOME="/c/apache-ant-1.10.9"
#export PATH="$PATH:$ANT_HOME/bin/" #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 if "${uname}" != "Linux"; then
PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/" 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/" export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"

3
java/net/i2p/router/WinLauncher.java
View File

@@ -73,7 +73,8 @@ public class WinLauncher {
logger.info("Proxy timeout time set to zero"); logger.info("Proxy timeout time set to zero");
} else { } else {
// make an effort to not let people launch into sites if the proxy // 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")) { if (arg.startsWith("http://localhost:76")) {
newArgsList.add(arg); newArgsList.add(arg);
proxyTimeoutTime = 0; proxyTimeoutTime = 0;