generate source tarball of embedded I2P router after pulling in all available tags

.gitignore

@@ -21,4 +21,8 @@ cmd
 *.jar
 *.zip
 *.tar.gz
-config_override.sh
+config_override.sh
+i2pkeys
+onionkeys
+tlskeys
+tmp

GOALS.md

@@ -50,8 +50,8 @@ Launcher
 - `[X]` Wait for router console to be ready to launch router-console browser
 - `[X]` Wait for proxy to be ready to launch I2P Web Browser
 - `[X]` Launch browser instead of router when a repeat-launch is detected
-- `[ ]` [GUI component for launching each available component](http://git.idk.i2p/idk/i2p.plugins.firefox/-/issues/2)
-- `[ ]` [Introduce `browser.properties` for customization](http://git.idk.i2p/idk/i2p.plugins.firefox/-/issues/7)
+- `[X]` GUI component for launching each available component
+- `[X]` Introduce `browser.properties` for customization
 - `[ ]` Registry-based browser discovery [Firefox](http://git.idk.i2p/idk/i2p.plugins.firefox/-/issues/3) [Chromium](http://git.idk.i2p/idk/i2p.plugins.firefox/-/issues/4)
 
 Browser Configuration All

Makefile

@@ -7,10 +7,13 @@ preset=`rm .version; make version`
 
 -include .version
 
-PROFILE_VERSION=$(MAJOR).$(MINOR).$(BUILD)
+PROFILE_VERSION=$(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONBUILD)
 
 all: version prep install.exe
 
+fmt:
+	find . -name '*.java' -exec clang-format -i {} \;
+
 tag:
 	git tag $(PROFILE_VERSION)
 
@@ -56,7 +59,7 @@ install.exe: #build/licenses
 
 export RES_DIR="../i2p.i2p.jpackage-build/installer/resources"
 export PKG_DIR="../i2p.i2p.jpackage-build/pkg-temp"
-export I2P_JBIGI="../i2p.i2p.jpackage-build/installer/lib/jbigi"
+#export I2P_JBIGI="../i2p.i2p.jpackage-build/installer/lib/jbigi"
 
 distclean: clean
 	rm -rf I2P
@@ -67,7 +70,7 @@ I2P:
 build/I2P: I2P build
 	rm -rf build/I2P
 	cp -rv I2P build/I2P ; true
-	cp "$(I2P_JBIGI)"/*windows*.dll build/I2P/runtime/lib; true
+#	cp "$(I2P_JBIGI)"/*windows*.dll build/I2P/runtime/lib; true
 
 src/I2P/config:
 	mkdir -p src/I2P/config
@@ -127,8 +130,11 @@ include makefiles/debian.mk
 
 I2P_DATE=`date +%Y-%m-%d`
 
-MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
-MAGNET_TESTING=`bttools torrent printinfo i2pwinupdate-testing.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
+MAGNET=`bttools torrent dumpinfo i2pwinupdate.su3.torrent | grep 'Magnet' | sed 's|Magnet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
+MAGNET_TESTING=`bttools torrent dumpinfo i2pwinupdate-testing.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
+
+magnet:
+	echo "$(MAGNET)"
 
 BLANK=`awk '! NF { print NR; exit }' changelog.txt`
 

amo-version.sh

@@ -1,4 +0,0 @@
-#! /usr/bin/env bash
-
-curl -s "https://addons.mozilla.org/api/v5/addons/addon/$1/versions/?page_size=1" | jq '.results | .[0] | .file | .url' | tr -d '"'
-

build.sh

@@ -25,6 +25,8 @@ if [ -z $machine ]; then
   esac
 fi
 
+ICON="src/icons/ui2pbrowser_icon.ico"
+
 if [ "$machine" = "Mac" ]; then
   rm -rf I2P
   ./getprebuilt.sh
@@ -33,6 +35,8 @@ elif [ "$machine" = "Linux" ]; then
   rm -rf I2P
   ./getprebuilt.sh
   exit 0
+elif [ "$machine" = "unix" ]; then
+  ICON=src/icons/windowsUIToopie2.png
 fi
 
 . "$SCRIPT_DIR/launcher.sh"
@@ -47,6 +51,7 @@ rm -rf I2P
 
 make src/I2P/config
 
+if [ ! -d "I2P" ]; then
 "$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
   --verbose \
   --java-options "-Xmx512m" \
@@ -59,10 +64,12 @@ make src/I2P/config
   --resource-dir build \
   --app-content src/I2P/config \
   --app-content src/unix/torbrowser.sh \
+  --app-content src/win/torbrowser-windows.sh \
   --app-content src/icons/windowsUIToopie2.png \
   --app-content src/icons/ui2pbrowser_icon.ico \
-  --icon src/icons/windowsUIToopie2.png \
+  --icon "${ICON}" \
   --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
+fi
 
 cp "$I2P_PKG/licenses/"* license/
 cp "$HERE/../i2p.i2p.jpackage-build/LICENSE.txt" license/I2P.txt

config.sh

@@ -10,17 +10,21 @@ uname=$(uname)
 # to use it for Oracle OpenJDK18
 
 if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
-    PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
-    export PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
-    JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
-    export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
+    PATH="/c/Program Files/Java/jdk-19/bin/:$PATH:/c/Program Files/Java/jdk-19/bin/"
+    export PATH="/c/Program Files/Java/jdk-19/bin/:$PATH:/c/Program Files/Java/jdk-19/bin/"
+    JAVA_HOME="/c/Program Files/Java/jdk-19"
+    export JAVA_HOME="/c/Program Files/Java/jdk-19"
+    HOST=win32
+    export HOST=win32
 fi
 
 if [ "${uname}" != "Linux" ]; then
-    PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
-    export PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
-    JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
-    export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
+    PATH="/c/Program Files/Java/jdk-19/bin/:$PATH:/c/Program Files/Java/jdk-19/bin/"
+    export PATH="/c/Program Files/Java/jdk-19/bin/:$PATH:/c/Program Files/Java/jdk-19/bin/"
+    JAVA_HOME="/c/Program Files/Java/jdk-19"
+    export JAVA_HOME="/c/Program Files/Java/jdk-19"
+    HOST=win32
+    export HOST=win32
 fi
 
 
@@ -74,9 +78,13 @@ fi
 if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
     PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
     export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
+    export PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
 fi
 
 if [ "${uname}" != "Linux" ]; then
     PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
     export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
+    export PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
 fi

daily-linux.sh

@@ -50,3 +50,4 @@ sleep 2s
 ZIPCHECKSUM=$(sha256sum "I2P.tar.gz")
 echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.tar.gz" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.tar.gz"
 github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.tar.gz" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.tar.gz"
+

daily-portable-windows.sh

@@ -0,0 +1,52 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f config_overide.sh ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+### How to set up this script:
+#
+# This script will not work unless you give it a Github API key.
+# You need to create a file in your $HOME directory, which on
+# Windows will by /c/Users/yourusername, called github-release-config.sh,
+# containing this key as the variable GITHUB_TOKEN.
+# github-release-config.sh must also contain:
+# GITHUB_USERNAME=your github username
+git clean -fd
+git checkout .
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+TODAYSDATE=$(date +%Y%m%d)
+
+if [ -z "$DESCRIPTION" ]; then
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
+fi
+
+echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+
+./zip.sh
+WINZIPCHECKSUM=$(sha256sum "I2P-windows-portable.zip")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-windows-portable.zip" -l "$WINZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P-windows-portable.zip"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-windows-portable.zip" -l "$WINZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P-windows-portable.zip"

daily.sh

@@ -51,7 +51,6 @@ powershell Compress-Archive -force I2P I2P.zip
 ZIPCHECKSUM=$(sha256sum "I2P.zip")
 echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
 github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
-
 TARCHECKSUM=$(sha256sum "../i2p.i2p.jpackage-build.tar.gz")
 echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
 github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"

fixperms.sh

@@ -0,0 +1,6 @@
+#! /usr/bin/env sh
+
+find I2P -type d -exec chmod -v 755 {} \;
+find I2P -type f -exec chmod -v +rw {} \;
+find I2P -type d -exec chmod -v 755 {} \;
+find I2P -type f -exec chmod -v +rw {} \;

getprebuilt.sh

@@ -18,8 +18,14 @@ fi
 
 . "$HOME/github-release-config.sh"
 
-TODAYSDATE=$(date -d '-1 day' '+%Y%m%d')
+if [ -z $TODAYSDATE ]; then
+  TODAYSDATE=$(date -d '-1 day' '+%Y%m%d')
+fi
 
-echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE"
-github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE"
-unzip I2P.zip
+if [ ! -f I2P.zip ]; then
+  echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE"
+  github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE"
+fi
+unzip I2P.zip
+sleep 3
+./fixperms.sh

i2ptunnel.config

@@ -21,7 +21,7 @@ tunnel.0.type=httpclient
 tunnel.0.sharedClient=false
 tunnel.0.interface=127.0.0.1
 tunnel.0.listenPort=4444
-tunnel.0.proxyList=false.i2p
+tunnel.0.proxyList=exit.stormycloud.i2p
 tunnel.0.i2cpHost=127.0.0.1
 tunnel.0.i2cpPort=7654
 tunnel.0.option.inbound.nickname=HTTP Proxy
@@ -31,7 +31,7 @@ tunnel.0.option.i2cp.reduceIdleTime=900000
 tunnel.0.option.i2cp.reduceOnIdle=true
 tunnel.0.option.i2cp.reduceQuantity=1
 tunnel.0.option.i2p.streaming.connectDelay=1000
-tunnel.0.option.i2ptunnel.httpclient.SSLOutproxies=false.i2p
+tunnel.0.option.i2ptunnel.httpclient.SSLOutproxies=exit.stormycloud.i2p
 tunnel.0.option.inbound.length=3
 tunnel.0.option.inbound.lengthVariance=0
 tunnel.0.option.outbound.length=3

i2pversion

@@ -1,16 +1,17 @@
 #! /usr/bin/env sh
 
-JNA_VERSION=5.11.0
-export JNA_VERSION=5.11.0
-I2PFIREFOX_VERSION=1.0.1
-export I2PFIREFOX_VERSION=1.0.1
+JNA_VERSION=5.12.1
+export JNA_VERSION=5.12.1
+I2PFIREFOX_VERSION=1.0.7
+export I2PFIREFOX_VERSION=1.0.7
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
-VERSIONMAJOR=1
-VERSIONMINOR=9
-VERSIONBUILD=7
+VERSIONMAJOR=2
+VERSIONMINOR=0
+VERSIONBUILD=0
 I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
-VERSION=i2p-jpackage-1.9.4
-export VERSION=i2p-jpackage-1.9.4
-
+#VERSION=i2p-2.0.0
+#export VERSION=i2p-2.0.0
+VERSION=master
+export VERSION=master

java/net/i2p/router/CopyConfigDir.java

@@ -66,18 +66,21 @@ public class CopyConfigDir extends WindowsServiceUtil {
         if (0 == cnr)
           return false;
         if (1 == cnr) {
-          logger.info("using jpackaged configs in a jpackaged install, creating jpackaged file");
+          logger.info(
+              "using jpackaged configs in a jpackaged install, creating jpackaged file");
           File jpackagedConfigsInUse = new File(appImageHome(), "jpackaged");
-          if (!jpackagedConfigsInUse.exists()){
-            try{
+          if (!jpackagedConfigsInUse.exists()) {
+            try {
               jpackagedConfigsInUse.createNewFile();
-            }catch(IOException e){
-              logger.warning("Error creating jpackaged file, delete config files manually when uninstalling");
+            } catch (IOException e) {
+              logger.warning(
+                  "Error creating jpackaged file, delete config files manually when uninstalling");
             }
           }
         }
         if (-1 == cnr) {
-          logger.info("not overwriting existing config file, not creating jpackaged file");
+          logger.info(
+              "not overwriting existing config file, not creating jpackaged file");
         }
       }
     }

java/net/i2p/router/WinLauncher.java

@@ -88,7 +88,7 @@ public class WinLauncher extends CopyConfigDir {
     File programs = programFile();
     File home = homeDir();
 
-    System.setProperty("i2p.dir.base", programs.getAbsolutePath());
+    System.setProperty("i2p.dir.base", new File(programs.getAbsolutePath(), "config").getAbsolutePath());
     System.setProperty("i2p.dir.config", home.getAbsolutePath());
     System.setProperty("router.pid",
                        String.valueOf(ProcessHandle.current().pid()));
@@ -172,7 +172,8 @@ public class WinLauncher extends CopyConfigDir {
       i2pRouter = new Router(routerconf, System.getProperties());
       String newsURL = i2pRouter.getConfigSetting("router.newsURL");
       if (newsURL != null) {
-        if (newsURL.contains("http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/win/beta/news.su3")) {
+        if (newsURL.contains(
+                "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/win/beta/news.su3")) {
           logger.info(
               "checked router.newsURL config, containes win/beta in a service install, invalid update type");
           if (i2pRouter.saveConfig("router.newsURL", ServiceUpdaterString())) {
@@ -183,7 +184,8 @@ public class WinLauncher extends CopyConfigDir {
       }
       String backupNewsURL = i2pRouter.getConfigSetting("router.backupNewsURL");
       if (backupNewsURL != null) {
-        if (backupNewsURL.contains("http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/win/beta/news.su3")) {
+        if (backupNewsURL.contains(
+                "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/win/beta/news.su3")) {
           logger.info(
               "checked router.backupNewsURL config, containes win/beta in a service install, invalid update type");
           if (i2pRouter.saveConfig("router.backupNewsURL",
@@ -195,7 +197,8 @@ public class WinLauncher extends CopyConfigDir {
       }
       String updateURL = i2pRouter.getConfigSetting("router.updateURL");
       if (updateURL != null) {
-        if (updateURL.contains("http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3")) {
+        if (updateURL.contains(
+                "http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3")) {
           logger.info(
               "checked router.updateURL config, containes easy-intall update in a service install, invalid update type");
           if (i2pRouter.saveConfig("router.updateURL",
@@ -310,6 +313,12 @@ public class WinLauncher extends CopyConfigDir {
         logger.info(e.toString());
       }
     }
+    Runtime.getRuntime().addShutdownHook(new Thread() {
+      @Override
+      public void run() {
+        setNotStarting();
+      }
+    });
   }
 
   private static boolean checkStarting() {

java/net/i2p/router/WinUpdateProcess.java

@@ -62,13 +62,22 @@ class WinUpdateProcess implements Runnable {
         env.put("RESTART_I2P", "true");
 
       try {
-        pb.directory(workingDir)
-            .redirectErrorStream(true)
-            .redirectOutput(logFile)
-            .start();
+        Process p = pb.directory(workingDir)
+                        .redirectErrorStream(true)
+                        .redirectOutput(logFile)
+                        .start();
+        exitCode = p.waitFor();
+        if (exitCode != 0)
+          _log.error("Update failed with exit code " + exitCode + " see " +
+                     logFile.getAbsolutePath() + " for more details");
       } catch (IOException ex) {
         _log.error(
-            "Unable to run update-program in background. Update will fail.");
+            "Unable to run update program in background. Update will fail.",
+            ex);
+      } catch (InterruptedException ex) {
+        _log.error(
+            "Unable to run update program in background. Update will fail.",
+            ex);
       }
     } else {
       // If we cant write to the log file and we're on Windows, use the elevator

java/net/i2p/router/WindowsUpdatePostProcessor.java

@@ -39,14 +39,27 @@ public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
                                           String version, File file)
       throws IOException {
     _log.info("Got an update to post-process");
-    if (SystemVersion.isWindows()) {
+    if (type != UpdateType.ROUTER_SIGNED_SU3 &&
+        type != UpdateType.ROUTER_DEV_SU3) {
+      _log.warn("Unsupported update type " + type);
+      return;
+    }
+    if (fileType != SU3File.TYPE_ZIP) {
+      this.positionedFile = moveUpdateInstaller(file);
+      this.version = version;
 
-      if (type != UpdateType.ROUTER_SIGNED_SU3 &&
-          type != UpdateType.ROUTER_DEV_SU3) {
-        _log.warn("Unsupported update type " + type);
+      if (!hook.compareAndSet(false, true)) {
+        _log.info("shutdown hook was already set");
         return;
       }
 
+      _log.info("adding shutdown hook");
+
+      ctx.addFinalShutdownTask(
+          new ZipUpdateProcess(ctx, this::getVersion, this::getFile));
+    }
+    if (SystemVersion.isWindows()) {
+
       if (fileType != SU3File.TYPE_EXE) {
         _log.warn("Unsupported file type " + fileType);
         return;

java/net/i2p/router/ZipUpdateProcess.java

@@ -0,0 +1,112 @@
+package net.i2p.router;
+
+import java.io.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Map;
+import java.util.function.*;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import net.i2p.I2PAppContext;
+import net.i2p.router.*;
+import net.i2p.util.Log;
+
+public class ZipUpdateProcess implements Runnable {
+  private final RouterContext ctx;
+  private final Supplier<String> versionSupplier;
+  private final Supplier<File> fileSupplier;
+  private final Log _log;
+
+  ZipUpdateProcess(RouterContext ctx, Supplier<String> versionSupplier,
+                   Supplier<File> fileSupplier) {
+    this.ctx = ctx;
+    this.versionSupplier = versionSupplier;
+    this.fileSupplier = fileSupplier;
+    this._log = ctx.logManager().getLog(ZipUpdateProcess.class);
+  }
+
+  private File workDir() throws IOException {
+    if (ctx != null) {
+      File workDir =
+          new File(ctx.getConfigDir().getAbsolutePath(), "i2p_update_zip");
+      if (workDir.exists()) {
+        if (workDir.isFile())
+          throw new IOException(workDir +
+                                " exists but is a file, get it out of the way");
+        return workDir;
+      } else {
+        workDir.mkdirs();
+      }
+      return workDir;
+    }
+    return null;
+  }
+
+  private void unzipUpdateInstaller() throws IOException {
+    String version = versionSupplier.get();
+    File file = fileSupplier.get();
+    if (file == null)
+      return;
+
+    File workingDir = workDir();
+    File zipFile = new File(workingDir, "i2pupdate_portable.zip");
+    File destDir = ctx.getConfigDir();
+
+    String errors = unzip(zipFile.getAbsolutePath(), destDir.getAbsolutePath());
+    _log.error(errors);
+  }
+
+  @Override
+  public void run() {
+    try {
+      unzipUpdateInstaller();
+    } catch (IOException ioe) {
+      _log.error("Error running updater, update may fail." + ioe);
+    }
+  }
+
+  // copied wholesale from this example:
+  // https://www.digitalocean.com/community/tutorials/java-unzip-file-example
+  // It doesn't check for zip-slips, but that's fine because if somebody's able
+  // to deliver a malicious update then they can just run code anyway so there's
+  // no point.
+  private static String unzip(String zipFilePath, String destDir) {
+    File dir = new File(destDir);
+    // create output directory if it doesn't exist
+    if (!dir.exists())
+      dir.mkdirs();
+    FileInputStream fis;
+    // buffer for read and write data to file
+    byte[] buffer = new byte[1024];
+    try {
+      fis = new FileInputStream(zipFilePath);
+      ZipInputStream zis = new ZipInputStream(fis);
+      ZipEntry ze = zis.getNextEntry();
+      while (ze != null) {
+        String fileName = ze.getName();
+        File newFile = new File(destDir + File.separator + fileName);
+        System.out.println("Unzipping to " + newFile.getAbsolutePath());
+        // create directories for sub directories in zip
+        new File(newFile.getParent()).mkdirs();
+        FileOutputStream fos = new FileOutputStream(newFile);
+        int len;
+        while ((len = zis.read(buffer)) > 0) {
+          fos.write(buffer, 0, len);
+        }
+        fos.close();
+        // close this ZipEntry
+        zis.closeEntry();
+        ze = zis.getNextEntry();
+      }
+      // close last ZipEntry
+      zis.closeEntry();
+      zis.close();
+      fis.close();
+    } catch (IOException e) {
+      return e.toString();
+    }
+    return null;
+  }
+}

launcher.sh

@@ -41,24 +41,27 @@ sleep 5s
 HERE="$PWD"
 if [ ! -d "$HERE/../i2p.i2p.jpackage-build/" ]; then
   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
+git pull --tags
+git archive --format=tar.gz --output="$HERE/../i2p.firefox/i2p.i2p.jpackage-build.tar.gz" "$VERSION"
 for i in $COUNT; do
   echo -n "$i...."; sleep 1s
 done
 ant distclean pkg || true
+ant jbigi
 
 cd "$HERE"
 export I2P_PKG="$HERE/../i2p.i2p.jpackage-build/pkg-temp"
 export RES_DIR="$HERE/../i2p.i2p.jpackage-build/installer/resources"
 export I2P_JARS="$I2P_PKG/lib"
 export I2P_JBIGI="$HERE/../i2p.i2p.jpackage-build/installer/lib/jbigi"
+export I2P_JBIGI_JAR="$HERE/../i2p.i2p.jpackage-build/build/jbigi.jar"
 
 echo "compiling custom launcher"
 mkdir -p build
 cp "$I2P_JARS"/*.jar build
+cp "$I2P_JBIGI_JAR" build
 if [ ! -f "$HERE/build/jna.jar" ]; then
   wget -O "$HERE/build/jna.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar"
 fi
@@ -71,15 +74,21 @@ if [ ! -f "$HERE/build/i2pfirefox.jar" ]; then
   wget -O "$HERE/build/i2pfirefox.jar" "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar"
 fi
 
+for dll in "$I2P_JBIGI/"*windows*.dll; do
+  jar uf "$HERE/build/jbigi.jar" "$dll"
+done
+
 cd java
-"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/i2pfirefox.jar:$HERE/build/jna.jar":"$HERE/build/jna-platform.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar" \
+"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/i2pfirefox.jar:$HERE/build/jna.jar":"$HERE/build/jna-platform.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar":"$HERE/build/jbigi.jar" \
   net/i2p/router/CopyConfigDir.java \
   net/i2p/router/Elevator.java \
   net/i2p/router/Shell32X.java \
+  net/i2p/router/WindowsServiceUtil.java \
   net/i2p/router/WinLauncher.java \
   net/i2p/router/WindowsUpdatePostProcessor.java \
   net/i2p/router/WinUpdateProcess.java \
-  net/i2p/router/WindowsServiceUtil.java
+  net/i2p/router/WindowsServiceUtil.java \
+  net/i2p/router/ZipUpdateProcess.java
 
 cd ..
 

makefiles/su.mk

@@ -7,11 +7,11 @@ $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
 		go mod vendor && go build
 
 prepupdate:
-	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3
+	cp -v "I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3
 
 su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
-	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
-	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" $(PROFILE_VERSION) $(SIGNER)
+	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(PROFILE_VERSION)"
+	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed.exe I2P-Easy-Install-Bundle-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" $(PROFILE_VERSION) $(SIGNER)
 
 i2pwinupdate.su3.torrent: prepupdate su3
 	mktorrent \

src/nsis/i2pbrowser-installer.nsi

@@ -197,6 +197,7 @@ Function installerFunction
 
     CreateShortCut "$DESKTOP\Browse I2P.lnk" "$INSTDIR\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
     CreateShortCut "$DESKTOP\Browse I2P - Temporary Identity.lnk" "$INSTDIR\I2P.exe -private" "" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\Uninstall I2P Easy-Install Bundle.lnk" "$INSTDIR\uninstall-i2pbrowser.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
     SetOutPath "$INSTDIR"
 
     SetShellVarContext current
@@ -210,9 +211,8 @@ Function installerFunction
     SetOutPath "$INSTDIR"
     # create the uninstaller
     WriteUninstaller "$INSTDIR\uninstall-i2pbrowser.exe"
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\Uninstall I2P Easy-Install Bundle.lnk" "$INSTDIR\uninstall-i2pbrowser.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
 
-    # create a shortcut to the uninstaller
-    CreateShortCut "$SMPROGRAMS\${APPNAME}\Uninstall-${APPNAME}.lnk" "$INSTDIR\uninstall-i2pbrowser.exe"
 FunctionEnd
 
 

src/win/torbrowser-windows.sh

@@ -0,0 +1,32 @@
+#!/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
+    . /etc/default/locale
+    locale=$(echo "${LANG}" | cut -d . -f1)
+fi
+
+if [ ! -f ./tor.keyring ]; then
+    gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org
+    gpg --output ./tor.keyring --export torbrowser@torproject.org
+fi
+
+if [ ! -f "tor-browser-linux64-${version}_${locale}.exe" ]; then
+    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/torbrowser-install-win64-${version}_${locale}.exe" 
+    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/torbrowser-install-win64-${version}_${locale}.exe.asc"
+fi
+
+gpgv --keyring ./tor.keyring "torbrowser-install-win64-${version}_${locale}.exe.asc" "torbrowser-install-win64-${version}_${locale}.exe"
+
+#tar xvJf "torbrowser-install-win64-${version}_${locale}.exe"
+#for n in `seq 1 2000`; do echo $n; dd ibs=256 if="torbrowser-install-win64-${version}_${locale}.exe" count=2 skip=$n | file - ; done 2>/dev/null |less
+#zip -FF "torbrowser-install-win64-${version}_${locale}.exe" --out extracted.zip
+export WINEPREFIX=$(pwd)/../tmp
+wine "torbrowser-install-win64-${version}_${locale}.exe" /S #/D .
+cp -vr "$WINEPREFIX/drive_c/users/idk/Desktop/Tor Browser/" "Tor Browser"

targz.sh

@@ -29,7 +29,4 @@ fi
 rm -vrf "tor-browser_${locale}"
 cd "$SCRIPT_DIR" || exit 1
 
-
-
-
 tar czvf I2P.tar.gz I2P

zip.sh

@@ -0,0 +1,35 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+./clean.sh
+wsl make distclean
+./build.sh
+./fixperms.sh
+cd "$SCRIPT_DIR/I2P" || exit 1
+
+TORSOCKS=$(which torsocks)
+if [ -f "${TORSOCKS}" ]; then
+    . "${TORSOCKS}" on
+fi
+#./torbrowser-windows.sh
+../src/win/torbrowser-windows.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
+
+rm -rf I2P-portable && cp -r I2P I2P-portable
+#powershell Compress-Archive -force I2P-portable I2P-windows-portable.zip
+zip -r I2P-windows-portable.zip I2P-portable