clone i2p.i2p to depth=1

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
 ------

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

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

src/unix/torbrowser.sh

@@ -1,4 +1,10 @@
-#!/bin/sh
+#!/bin/bash
+
+TORSOCKS=$(which torsocks)
+if [ -f "${TORSOCKS}" ]; then
+    . "${TORSOCKS}" on
+fi
+
 version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
 locale="en-US" # mention your locale. default = en-US
 if [ -d /etc/default/locale ]; then
@@ -11,11 +17,11 @@ if [ ! -f ./tor.keyring ]; then
     gpg --output ./tor.keyring --export torbrowser@torproject.org
 fi
 
-if [ ! -f "tor-browser-linux64-"$version"_"$locale".tar.xz" ]; then
-    wget -cv "https://www.torproject.org/dist/torbrowser/"$version"/tor-browser-linux64-"$version"_"$locale".tar.xz" 
-    wget -cv "https://www.torproject.org/dist/torbrowser/"$version"/tor-browser-linux64-"$version"_"$locale".tar.xz.asc"
+if [ ! -f "tor-browser-linux64-${version}_${locale}.tar.xz" ]; then
+    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${locale}.tar.xz" 
+    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${locale}.tar.xz.asc"
 fi
 
-gpgv --keyring ./tor.keyring "tor-browser-linux64-"$version"_"$locale".tar.xz.asc" "tor-browser-linux64-"$version"_"$locale".tar.xz"
+gpgv --keyring ./tor.keyring "tor-browser-linux64-${version}_${locale}.tar.xz.asc" "tor-browser-linux64-${version}_${locale}.tar.xz"
 
-tar xvJf "tor-browser-linux64-"$version"_"$locale".tar.xz"
+tar xvJf "tor-browser-linux64-${version}_${locale}.tar.xz"

targz.sh

@@ -13,6 +13,23 @@ fi
 wsl make distclean
 ./build.sh
 cd "$SCRIPT_DIR/I2P" || exit 1
-# ./lib/torbrowser.sh <- haha just kidding, but uncomment this to make it pack everything it needs into the tar.gz
+
+TORSOCKS=$(which torsocks)
+if [ -f "${TORSOCKS}" ]; then
+    . "${TORSOCKS}" on
+fi
+./lib/torbrowser.sh
+version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
+. "${TORSOCKS}" off
+locale="en-US" # mention your locale. default = en-US
+if [ -d /etc/default/locale ]; then
+    . /etc/default/locale
+    locale=$(echo "${LANG}" | cut -d . -f1)
+fi
+rm -vrf "tor-browser_${locale}"
 cd "$SCRIPT_DIR" || exit 1
-tar czvf I2P.tar.gz I2P
+
+
+
+
+tar czvf I2P.tar.gz I2P