From 67e0b87d9745cf3ec0cf354fcc80449249c3df00 Mon Sep 17 00:00:00 2001
From: idk <hankhill19580@gmail.com>
Date: Sat, 8 Oct 2022 13:14:04 -0400
Subject: [PATCH] clone i2p.i2p to depth=1

---
 README.md                         |  3 ++-
 launcher.sh                       |  3 ++-
 src/nsis/i2pbrowser-installer.nsi | 14 +++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index cf60eb3..34ffb01 100644
--- a/README.md
+++ b/README.md
@@ -234,7 +234,8 @@ testing.
 
 **The only remotely interesting Unix functionality that remains in this**
 **repository is the construction of a portable. You can use `targz.sh` to**
-**generate that.**
+**generate that. Once generated, `cd I2P && ./lib/torbrowser.sh` to complete**
+**setup, and `./bin/I2P` to run it.**
 
 Issues
 ------
diff --git a/launcher.sh b/launcher.sh
index b3aa7ac..7447d4a 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -40,10 +40,11 @@ sleep 5s
 
 HERE="$PWD"
 if [ ! -d "$HERE/../i2p.i2p.jpackage-build/" ]; then
-  git clone -b "$VERSION" https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/"
+  git clone --depth=1 -b "$VERSION" https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/"
   tar --exclude="$HERE/../i2p.i2p.jpackage-build/.git" -cvzf i2p.i2p.jpackage-build.tar.gz "$HERE/../i2p.i2p.jpackage-build/"
 fi
 cd "$HERE/../i2p.i2p.jpackage-build/"
+git pull --all
 for i in $COUNT; do
   echo -n "$i...."; sleep 1s
 done
diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi
index e35a7c1..83650f2 100644
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@@ -18,7 +18,7 @@ var INSTDIR
 SetOverwrite on
 
 !define INSTDIR
-!define I2PINSTEXE_USERMODE "$LOCALAPPDATA\i2p"
+!define I2PINSTEXE_USERMODE "$LOCALAPPDATA\i2peasy"
 
 !define RAM_NEEDED_FOR_64BIT 0x80000000
 
@@ -128,12 +128,14 @@ PageExEnd
 Page instfiles
 
 Function .onInit
+    # Note: This is all redundant and I know it.
+    # Admin installs have been migrated to user-mode installs.
+    # But I'm leaving it because I might need it again if I support service installs.
     StrCpy $INSTDIR "${I2PINSTEXE_USERMODE}"
     UserInfo::GetAccountType
     pop $0
     ${If} $0 != "admin"
         StrCpy $INSTDIR "${I2PINSTEXE_USERMODE}"
-        StrCpy $INSTDIR "${I2PINSTEXE_USERMODE}"
     ${EndIf}
     !insertmacro MUI_LANGDLL_DISPLAY
     #Call ShouldInstall64Bit
@@ -182,8 +184,6 @@ Function installerFunction
 
     # Install the launcher scripts
     createDirectory "$INSTDIR"
-    #SetOutPath "$INSTDIR"
-    #File "win/*"
 
     # Install the licenses
     createDirectory "$INSTDIR\licenses"
@@ -201,7 +201,7 @@ Function installerFunction
 
     SetShellVarContext current
 
-    IfFileExists "$LOCALAPPDATA\I2P\eepsite\docroot" +2 0
+    IfFileExists "$INSTDIR\eepsite\docroot" +2 0
         File  /a /r "I2P\eepsite"
 
     createDirectory "$INSTDIR"
@@ -230,7 +230,6 @@ Section "uninstall"
     Delete "$INSTDIR\ui2pbrowser_icon.ico"
     Delete "$INSTDIR\windowsUItoopie2.png"
     Delete "$INSTDIR\I2P.exe"
-    
 
     # Remove shortcuts and folders
     Delete "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
@@ -260,12 +259,9 @@ Section "uninstall"
         Delete $INSTDIR\*
         rmDir /r "$INSTDIR"
     ${EndIf}
-
     # delete the uninstaller
     Delete "$INSTDIR\uninstall-i2pbrowser.exe"
-
     # uninstaller section end
-
 SectionEnd
 
 !define MUI_FINISHPAGE_RUN