From 6de7e95a4bbf07a6bf212188ab52f1da61b956a3 Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Sat, 20 Aug 2022 23:26:03 -0400
Subject: [PATCH] always install exe but don't always install own config files

---
 java/net/i2p/router/WinLauncher.java |  9 +++++-
 src/nsis/i2pbrowser-installer.nsi    | 48 +++++++++++++---------------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/java/net/i2p/router/WinLauncher.java b/java/net/i2p/router/WinLauncher.java
index 089a656..ed326e7 100644
--- a/java/net/i2p/router/WinLauncher.java
+++ b/java/net/i2p/router/WinLauncher.java
@@ -50,6 +50,13 @@ public class WinLauncher {
         } catch (IOException e) {
             e.printStackTrace();
         }
+        boolean privateBrowsing = false;
+        if (args != null && args.length > 0) {
+            if (args[0].equals("-private")) {
+                privateBrowsing = true;
+                return;
+            }
+        }
 
         File programs = selectProgramFile();
         if (!programs.exists())
@@ -71,7 +78,7 @@ public class WinLauncher {
             logger.warning("I2P is already running");
             I2PFirefox i2pFirefox = new I2PFirefox();
             System.out.println("I2PFirefox");
-            i2pFirefox.launch();
+            i2pFirefox.launch(privateBrowsing);
             return;
         }
 
diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi
index 3da0956..7b7ecfe 100644
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@@ -190,34 +190,30 @@ Function firefoxDetect
 FunctionEnd
 
 Function routerDetect
-    ${If} ${FileExists} "$I2PINSTEXE"
-        Abort directory
-    ${Else}
-        createDirectory $I2PINSTEXE
-        SetOutPath $I2PINSTEXE
-        File /nonfatal /a /r "I2P\"
-        File /nonfatal /a /r "I2P\I2P.exe"
-        File /nonfatal "I2P\config\jpackaged"
+    createDirectory $I2PINSTEXE
+    SetOutPath $I2PINSTEXE
+    File /nonfatal /a /r "I2P\"
+    File /nonfatal /a /r "I2P\I2P.exe"
+    File /nonfatal "I2P\config\jpackaged"
 
-        createDirectory "$I2PINSTEXE\"
-        SetOutPath "$I2PINSTEXE\"
-        IfFileExists $I2PINSTEXE\router.config +2 0
-            File /nonfatal /a /r "I2P/config/router.config"
-        IfFileExists $I2PINSTEXE\clients.config +2 0
-            File /nonfatal /a /r "I2P/config/clients.config"
-        IfFileExists $I2PINSTEXE\i2ptunnel.config +2 0
-            File /nonfatal /a /r "I2P/config/i2ptunnel.config"
-        IfFileExists $I2PINSTEXE\wrapper.config +2 0
-            File /nonfatal /a /r "I2P/config/wrapper.config"
-        IfFileExists $I2PINSTEXE\eepsite +2 0
-            File /nonfatal /a /r "I2P/config/eepsite"
-        IfFileExists $I2PINSTEXE\webapps +2 0
-            File /nonfatal /a /r "I2P/config/webapps"
-        File /nonfatal /a /r "I2P/config/certificates"
-        File /nonfatal /a /r "I2P/config/geoip"
+    createDirectory "$I2PINSTEXE\"
+    SetOutPath "$I2PINSTEXE\"
+    IfFileExists $I2PINSTEXE\router.config +2 0
+        File /nonfatal /a /r "I2P/config/router.config"
+    IfFileExists $I2PINSTEXE\clients.config +2 0
+        File /nonfatal /a /r "I2P/config/clients.config"
+    IfFileExists $I2PINSTEXE\i2ptunnel.config +2 0
+        File /nonfatal /a /r "I2P/config/i2ptunnel.config"
+    IfFileExists $I2PINSTEXE\wrapper.config +2 0
+        File /nonfatal /a /r "I2P/config/wrapper.config"
+    IfFileExists $I2PINSTEXE\eepsite +2 0
+        File /nonfatal /a /r "I2P/config/eepsite"
+    IfFileExists $I2PINSTEXE\webapps +2 0
+        File /nonfatal /a /r "I2P/config/webapps"
+    File /nonfatal /a /r "I2P/config/certificates"
+    File /nonfatal /a /r "I2P/config/geoip"
 
-        Abort directory
-    ${EndIf}
+    Abort directory
 FunctionEnd
 
 Function installerFunction