copy app, runtime individually instead of the parent dir

experimental.sh

@@ -0,0 +1,17 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f config_overide.sh ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+./clean.sh
+wsl make distclean
+wsl make clean-extensions
+wsl make new-extensions
+./build.sh
+wsl make

java/net/i2p/router/WinLauncher.java

@@ -77,9 +77,9 @@ public class WinLauncher {
 
         if (i2pIsRunning()) {
             logger.warning("I2P is already running");
-            I2PBrowser i2pBrowser = new I2PBrowser();
-            System.out.println("i2pBrowser");
-            i2pBrowser.launch(privateBrowsing);
+            I2PFirefox i2pFirefox = new I2PFirefox();
+            System.out.println("I2PFirefox");
+            i2pFirefox.launch(privateBrowsing);
             return;
         }
 

makefiles/new-extensions.mk

@@ -2,7 +2,7 @@
 build-new-extensions: build/i2ppb@eyedeekay.github.io.xpi build/uBlock0@raymondhill.net.xpi build/jsr@javascriptrestrictor.xpi build/onioncbt@eyedeekay.github.io.xpi build/{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi
 
 build/uBlock0@raymondhill.net.xpi:
-	curl -L `cat UblockOrigin.url` > build/uBlock0@raymondhill.net.xpi
+	curl -L `cat UBlockOrigin.url` > build/uBlock0@raymondhill.net.xpi
 
 build/jsr@javascriptrestrictor.xpi:
 	curl -L `cat JShelter.url` > build/jsr@javascriptrestrictor.xpi

src/nsis/i2pbrowser-installer.nsi

@@ -14,13 +14,21 @@ UniCode true
 !include i2pbrowser-jpackage.nsi
 !include FindProcess.nsh
 
+var FFINSTEXE
+var FFNONTORINSTEXE
 var I2PINSTEXE
+Var PARENTOPTIONS
 
 SetOverwrite on
+!define FFINSTEXE
+!define FFNONTORINSTEXE
+!define FFINSTEXE32 "$PROGRAMFILES32\Mozilla Firefox\"
+!define FFINSTEXE64 "$PROGRAMFILES64\Mozilla Firefox\"
 
 !define I2PINSTEXE
 !define I2PINSTEXE_USERMODE "$LOCALAPPDATA\i2p"
 
+
 !define RAM_NEEDED_FOR_64BIT 0x80000000
 
 InstallDir "$PROGRAMFILES64\${COMPANYNAME}\${APPNAME}"
@@ -101,15 +109,15 @@ RequestExecutionLevel user
   !insertmacro MUI_LANGUAGE "Basque"
   !insertmacro MUI_LANGUAGE "Welsh"
 # Commented out languages below do not compile on NSIS v2
-  !insertmacro MUI_LANGUAGE "Asturian"
-  !insertmacro MUI_LANGUAGE "Pashto"
-  !insertmacro MUI_LANGUAGE "ScotsGaelic"
-  !insertmacro MUI_LANGUAGE "Georgian"
-  !insertmacro MUI_LANGUAGE "Vietnamese"
-  !insertmacro MUI_LANGUAGE "Armenian"
-  !insertmacro MUI_LANGUAGE "Corsican"
-  !insertmacro MUI_LANGUAGE "Tatar"
-  !insertmacro MUI_LANGUAGE "Hindi"
+#  !insertmacro MUI_LANGUAGE "Asturian"
+#  !insertmacro MUI_LANGUAGE "Pashto"
+#  !insertmacro MUI_LANGUAGE "ScotsGaelic"
+#  !insertmacro MUI_LANGUAGE "Georgian"
+#  !insertmacro MUI_LANGUAGE "Vietnamese"
+#  !insertmacro MUI_LANGUAGE "Armenian"
+#  !insertmacro MUI_LANGUAGE "Corsican"
+#  !insertmacro MUI_LANGUAGE "Tatar"
+#  !insertmacro MUI_LANGUAGE "Hindi"
 ### END LANGUAGES
 
 # small speed optimization
@@ -121,6 +129,12 @@ PageEx license
     licensetext "${LICENSE_TITLE}"
     licensedata "licenses\LICENSE.txt"
 PageExEnd
+PageEx directory
+    dirtext "${FIREFOX_MESSAGE}"
+    dirvar $FFINSTEXE
+    dirvar $FFNONTORINSTEXE
+    PageCallbacks firefoxDetect
+PageExEnd
 PageEx directory
     dirtext "${I2P_MESSAGE}"
     dirvar $I2PINSTEXE
@@ -128,7 +142,7 @@ PageEx directory
 PageExEnd
 Page instfiles
 
-#!include i2pbrowser-mozcompat.nsi
+!include i2pbrowser-mozcompat.nsi
 
 Function .onInit
     StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}"
@@ -139,34 +153,67 @@ Function .onInit
         StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}"
     ${EndIf}
     !insertmacro MUI_LANGDLL_DISPLAY
-    #Call ShouldInstall64Bit
+    Call ShouldInstall64Bit
+    ${If} $0 == 1
+        ${If} ${FileExists} "${FFINSTEXE64}\firefox.exe"
+            StrCpy $FFINSTEXE "${FFINSTEXE64}"
+            StrCpy $FFNONTORINSTEXE "${FFINSTEXE64}"
+    ${ElseIf} ${FileExists} "${FFINSTEXE32}\firefox.exe"
+            StrCpy $FFINSTEXE "${FFINSTEXE32}"
+            StrCpy $FFNONTORINSTEXE "${FFINSTEXE32}"
+        ${EndIf}
+        ${If} ${FileExists} "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\"
+        ${EndIf}
+        ${If} ${FileExists} "$PROFILE\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\Desktop\Tor Browser\Browser\"
+        ${EndIf}
+    ${Else}
+        ${If} ${FileExists} "${FFINSTEXE32}\firefox.exe"
+            StrCpy $FFINSTEXE "${FFINSTEXE32}"
+            StrCpy $FFNONTORINSTEXE "${FFINSTEXE32}"
+        ${EndIf}
+        ${If} ${FileExists} "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\"
+        ${EndIf}
+        ${If} ${FileExists} "$PROFILE\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\Desktop\Tor Browser\Browser\"
+        ${EndIf}
+    ${EndIf}
     # look for user installs
 FunctionEnd
 
+Function firefoxDetect
+    ${If} ${FileExists} "$FFINSTEXE\firefox.exe"
+        Abort directory
+    ${EndIf}
+FunctionEnd
+
 Function routerDetect
     createDirectory $I2PINSTEXE
+    SetOutPath $I2PINSTEXE/app
+    File /nonfatal /a /r "I2P\app\"
+    SetOutPath $I2PINSTEXE/runtime
+    File /nonfatal /a /r "I2P\runtime\"
     SetOutPath $I2PINSTEXE
-    File  /a /r "I2P\"
-    File  /nonfatal /a /r "I2P\I2P.exe"
-    File  "I2P\config\jpackaged"
+    File /nonfatal /a /r "I2P\I2P.exe"
+    File /nonfatal "I2P\config\jpackaged"
 
     createDirectory "$I2PINSTEXE\"
     SetOutPath "$I2PINSTEXE\"
     IfFileExists $I2PINSTEXE\router.config +2 0
-        File  /a /r "I2P/config/router.config"
+        File /nonfatal /a /r "I2P/config/router.config"
     IfFileExists $I2PINSTEXE\clients.config +2 0
-        File  /a /r "I2P/config/clients.config"
+        File /nonfatal /a /r "I2P/config/clients.config"
     IfFileExists $I2PINSTEXE\wrapper.config +2 0
-        File  /a /r "I2P/config/wrapper.config"
-    IfFileExists $I2PINSTEXE\hosts.txt +2 0
-        File  /a /r "I2P/config/hosts.txt"
+        File /nonfatal /a /r "I2P/config/wrapper.config"
     IfFileExists $I2PINSTEXE\eepsite +2 0
-        File  /a /r "I2P/config/eepsite"
+        File /nonfatal /a /r "I2P/config/eepsite"
     IfFileExists $I2PINSTEXE\webapps +2 0
-        File  /a /r "I2P/config/webapps"
-    File  /a /r "I2P/config/certificates"
-    File  /a /r "I2P/config/geoip"
-    File  /a /r "I2P/config/i2ptunnel.config"
+        File /nonfatal /a /r "I2P/config/webapps"
+    File /nonfatal /a /r "I2P/config/certificates"
+    File /nonfatal /a /r "I2P/config/geoip"
+    File /nonfatal /a /r "I2P/config/i2ptunnel.config"
 
     Abort directory
 FunctionEnd
@@ -192,11 +239,27 @@ ${If} ${Silent}
         ${If} ${Silent}
           ReadEnvStr $0 OLD_I2P_VERSION
           ${If} $0 < ${I2P_VERSION}
-            call routerDetect
+            rmDir /r $I2PINSTEXE/app
+            rmDir /r $I2PINSTEXE/runtime
+            File /nonfatal /a /r "I2P\"
+            File /nonfatal "I2P\config\jpackaged"
+
+            createDirectory "$I2PINSTEXE\"
+            SetOutPath "$I2PINSTEXE\"
+            File /nonfatal /a /r "I2P/config/certificates"
+            File /nonfatal /a /r "I2P/config/geoip"
 
           ${EndIf}  
         ${Else}
-          call routerDetect
+          rmDir /r $I2PINSTEXE/app
+          rmDir /r $I2PINSTEXE/runtime
+          File /nonfatal /a /r "I2P\"
+          File /nonfatal "I2P\config\jpackaged"
+
+          createDirectory "$I2PINSTEXE\"
+          SetOutPath "$I2PINSTEXE\"
+          File /nonfatal /a /r "I2P/config/certificates"
+          File /nonfatal /a /r "I2P/config/geoip"
 
         ${EndIf}
     ${EndIf}
@@ -224,11 +287,11 @@ ${If} ${Silent}
     SetOutPath "$I2PINSTEXE"
     createDirectory "$SMPROGRAMS\${APPNAME}"
     CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P.lnk" "$I2PINSTEXE\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
-    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P - Temporary Identity.lnk" "$I2PINSTEXE\I2P.exe -private" "" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P - Temporary Identity.lnk" "$I2PINSTEXE\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
 ;    CreateShortCut "$SMPROGRAMS\${APPNAME}\I2P Applications.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pconfig.bat$\"" "$INSTDIR\ui2pbrowser_icon.ico"
 
     CreateShortCut "$DESKTOP\Browse I2P.lnk" "$I2PINSTEXE\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
-    CreateShortCut "$DESKTOP\Browse I2P - Temporary Identity.lnk" "$I2PINSTEXE\I2P.exe -private" "" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$DESKTOP\Browse I2P - Temporary Identity.lnk" "$I2PINSTEXE\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
 ;    CreateShortCut "$DESKTOP\I2P Applications.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pconfig.bat$\"" "$INSTDIR\ui2pbrowser_icon.ico"
     SetOutPath "$INSTDIR"
 
@@ -248,7 +311,7 @@ ${If} ${Silent}
     SetOutPath "$I2PAPPDATA"
 
     IfFileExists "$LOCALAPPDATA\I2P\eepsite\docroot" +2 0
-        File  /a /r "I2P\eepsite"
+        File /nonfatal /a /r "I2P\eepsite"
 
     createDirectory "$I2PINSTEXE"
     SetOutPath "$I2PINSTEXE"