From 3cdc0d674a27511b9aa0107f1eaded2c40eb24dd Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Thu, 25 Mar 2021 20:59:22 -0400
Subject: [PATCH] Start an experimental jpackage-included branch

---
 .gitignore                        | 3 ++-
 Makefile                          | 6 +++++-
 src/nsis/i2pbrowser-installer.nsi | 8 +++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index cd9f25e..63896a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 build
 *.deb
-*.tgz
\ No newline at end of file
+*.tgz
+I2P
\ No newline at end of file
diff --git a/Makefile b/Makefile
index b0b03ed..4605b43 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,15 @@
 all: profile.tgz app-profile.tgz install.exe
 
-install.exe: profile build/licenses
+install.exe: profile build/licenses build/I2P
 	cp src/nsis/*.nsi build
 	cp src/nsis/*.nsh build
 	cp src/icons/*.ico build
 	cd build && makensis i2pbrowser-installer.nsi && cp I2P-Profile-Installer-*.exe ../ && echo "built windows installer"
 
+build/I2P:
+	rm -rf build/I2P
+	cp -rv I2P build/I2P
+
 #
 # Warning: a displayed license file of more than 28752 bytes
 # will cause makensis V3.03 to crash.
diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi
index 6e6b40e..b445f25 100644
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@@ -185,7 +185,9 @@ FunctionEnd
 
 Function routerDetect
     ${If} ${FileExists} "$I2PINSTEXE"
-        Abort directory
+        ## Abort directory
+        SetOutPath $I2PINSTEXE
+        File /a /r "I2P\"
     ${EndIf}
 FunctionEnd
 
@@ -204,7 +206,7 @@ Section Install
     FileWrite $0 "@echo off"
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
-    FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
+    FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe start"'
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
     FileWriteByte $0 "13"
@@ -221,7 +223,7 @@ Section Install
     FileWrite $0 "@echo off"
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
-    FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
+    FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe start"'
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
     FileWriteByte $0 "13"