use latest I2P version if tags aren't available

.github/workflows/ant.yml

@@ -31,7 +31,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: I2P-Easy-Install-Bundle-unsigned.exe
-          path: I2P-Easy-Install-Bundle-2.4.0.exe
+          path: I2P-Easy-Install-Bundle-*.exe
 
   buildjpackagexe:
     runs-on: windows-latest
@@ -48,7 +48,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: I2P-EXE-unsigned.exe
-          path: I2P-EXE-2.4.0.exe
+          path: I2P-EXE-*.exe
 
   buildjpackagmsi:
     runs-on: windows-latest
@@ -65,7 +65,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: I2P-MSI-unsigned.msi
-          path: I2P-MSI-2.4.0.msi
+          path: I2P-MSI-*.msi
 
   buildzip:
     runs-on: windows-latest
@@ -81,7 +81,8 @@ jobs:
           git config --global user.name "eyedeekay Github CI Build"
       - uses: actions/checkout@v4
       - run: wsl apt-get update
-      - run: wsl apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext zip 7z
+      - run: wsl apt-cache search 7zip
+      - run: wsl apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext zip p7zip-full ca-certificates
       - run: choco install wget
       - name: Set up JDK 21
         uses: actions/setup-java@v4
@@ -89,7 +90,7 @@ jobs:
           java-version: '21'
           distribution: 'temurin'
       - name: build with script
-        run: bash -c "./buildscripts/zip.sh; ls *.zip"
+        run: bash -c "./buildscripts/zip.sh; ls -d * */* "
       - name: Upload I2P-windows-portable.zip
         uses: actions/upload-artifact@v4
         with:

.github/workflows/release.yml

@@ -22,6 +22,16 @@ jobs:
           sparse-checkout-cone-mode: false
       - name: sleep 15 minutes
         run: |
+          echo "sleeping 20 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 19 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 18 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 17 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 16 minutes to wait for artifacts"
+          sleep 1m
           echo "sleeping 15 minutes to wait for artifacts"
           sleep 1m
           echo "sleeping 14 minutes to wait for artifacts"

README.md

@@ -1,5 +1,5 @@
-I2P Easy-Install Bundle for Windows(Also/formerly)I2P Browsing Profile for Firefox
-==================================================================================
+I2P Easy-Install Bundle for Windows, (Formerly)I2P Browsing Profile for Firefox
+===============================================================================
 
 Features:
 ---------
@@ -13,6 +13,13 @@ Features:
 Build Dependencies:
 -------------------
 
+**SHORTCUT:** All the build artifacts can be produced by the description in the `.yaml` files in `.github/workflows`.
+These can be run on Github's infrastructure, or on a local(Windows) PC using https://github.com/nektos/act.
+Doing things this way deals with all the dependency issues that Windows doesn't really give you a good way to deal with automatically.
+It also guarantees that the same base container and environment gets used for every build no matter what machine it runs on.
+I highly recommend you use either Github CI or `nektos/act` for dev builds of this software, as it **automates literally every one of the steps**.
+CI-based builds follow the `WSL` version of the instructions.
+
 To build this, you will need the following software packages
 (all available in Debian and Ubuntu, see WSL section below):
 
@@ -166,8 +173,6 @@ set up and you're using git bash, that is enough to make the scripts compatible
         cd i2p.firefox
         ./buildscripts/unsigned.sh
 
-6. Run `make` to build the installer.
-
 Doing a Release
 ---------------
 
@@ -180,53 +185,7 @@ bundle is Zlatinb. Standard Windows signing tools are used.
 ./release.sh
 ```
 
-produces the binary.
-
-Building a signed update file
------------------------------
-
-Building a signed update file for automatically updating a Windows I2P router
-requires you to either be using linux, or have Go installed in your Cygwin or WSL environment.
-On Linux(Where I sign the su3 files), this works:
-
-        make su3
-
-to run the signing tool if necessary and then package the installer in a
-signed update file.
-
-Docker Support
---------------
-
-**MOVED, DEPRECATION NOTICE:** Most of this functionality has been moved
-to http://git.idk.i2p/idk/i2p.plugins.firefox which is more stable,
-easier to build and use, and easier to incorporate into other
-projects.
-
- - https://git.idk.i2p/idk/i2p.plugins.firefox/-/blob/main/docker.sh
-
-Unix Support
-------------
-
-**MOVED. DEPRECATION NOTICE:** Most of this functionality has been moved
-to http://git.idk.i2p/idk/i2p.plugins.firefox which is more stable,
-easier to build and use, and easier to incorporate into other
-projects. It is the better option for nearly every non-Windows case
-right now. You can get binary packages from:
-
- - https://github.com/eyedeekay/i2p.plugins.firefox/releases
-
-or look at
-
- - https://i2pgit.org/idk/i2p.plugins.firefox/-/blob/master/PACKAGES.md
-
-for instructions on how to build your own packages. These packages are
-unofficial! Although I do dogfood most of them and the `.jar` gets thorough
-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. Once generated, `cd I2P && ./lib/torbrowser.sh` to complete**
-**setup, and `./bin/I2P` to run it.**
+produces the binary and the su3.
 
 Issues
 ------

buildscripts/launcher.sh

@@ -125,6 +125,7 @@ cd "$SCRIPT_DIR"/java
   net/i2p/router/CopyConfigDir.java \
   net/i2p/router/WindowsServiceUtil.java \
   net/i2p/router/WindowsAppUtil.java \
+  net/i2p/router/I2PAppUtil.java \
   net/i2p/router/WinUpdatePostProcessor.java \
   net/i2p/router/WinLauncher.java \
   net/i2p/router/WinUpdateProcess.java \

buildscripts/version.sh

@@ -18,9 +18,9 @@ fi
 echo "!define VERSIONMAJOR $VERSIONMAJOR" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
 echo "!define VERSIONMINOR $VERSIONMINOR" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
 echo "!define VERSIONBUILD $VERSIONBUILD" >> "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi
-echo "!define I2P_VERSION $PROFILE_VERSION" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-jpackage.nsi
+echo "!define I2P_VERSION $I2P_VERSION" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-jpackage.nsi
 
 mkdir -p "$SCRIPT_DIR"/build
-echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt
-echo "$PROFILE_VERSION" > "$SCRIPT_DIR"/build/version.txt
+echo "$I2P_VERSION" > "$SCRIPT_DIR"/build/version.txt
+echo "$I2P_VERSION" > "$SCRIPT_DIR"/build/version.txt
 sed 's|!define VERSION||g' "$SCRIPT_DIR"/src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version

i2pversion

@@ -4,12 +4,23 @@ JNA_VERSION=5.12.1
 export JNA_VERSION=5.12.1
 I2PFIREFOX_VERSION=1.4.991
 export I2PFIREFOX_VERSION=1.4.991
-# Comment this out to build from an alternate branch or
-# the tip of the master branch.
-VERSIONMAJOR=2
-VERSIONMINOR=4
-VERSIONBUILD=0
+
+export GITHUB_TAG=$(git describe --tags --abbrev=0 | sed 's|i2p||g' | tr -d [a-z-])
+VERSIONMAJOR=$(echo "$GITHUB_TAG" | cut -d . -f 1)
+VERSIONMINOR=$(echo "$GITHUB_TAG" | cut -d . -f 2)
+VERSIONBUILD=$(echo "$GITHUB_TAG" | cut -d . -f 3)
+if [ -z "$VERSIONBUILD" ]; then
+    VERSIONBUILD=2
+fi
+if [ -z "$VERSIONMINOR" ]; then
+    VERSIONMINOR=4
+fi
+if [ -z "$VERSIONMAJOR" ]; then
+    VERSIONMAJOR=0
+fi
 I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+# Comment this out to build from an alternate branch or
+# the tip of the master branch.
 VERSION=i2p-2.4.0
 export VERSION=i2p-2.4.0

java/net/i2p/router/CopyConfigDir.java

@@ -12,7 +12,7 @@ import java.util.logging.FileHandler;
 import java.util.logging.SimpleFormatter;
 import net.i2p.util.Log;
 
-public class CopyConfigDir extends WindowsAppUtil {
+public class CopyConfigDir extends I2PAppUtil {
   final Log logger;
 
   public CopyConfigDir(RouterContext ctx) {
@@ -142,7 +142,7 @@ public class CopyConfigDir extends WindowsAppUtil {
    * @return
    */
   protected File logFile(String p) {
-    File log = new File(selectProgramFile(), "logs");
+    File log = new File(selectHome(), "logs");
     if (!log.exists())
       log.mkdirs();
     return new File(log, p);

java/net/i2p/router/I2PAppUtil.java

@@ -0,0 +1,106 @@
+package net.i2p.router;
+
+import java.io.File;
+import java.io.IOException;
+import javax.swing.JOptionPane;
+
+public class I2PAppUtil extends WindowsAppUtil {
+  public String ServiceUpdaterString() {
+    return "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/news.su3";
+  }
+  public String ServiceBackupUpdaterString() {
+    return "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news.su3";
+  }
+  public String ServiceStaticUpdaterString() {
+    return "http://echelon.i2p/i2p/i2pupdate.sud,http://stats.i2p/i2p/i2pupdate.sud";
+  }
+
+  public String getProgramFilesInstall() {
+    String programFiles = System.getenv("PROGRAMFILES");
+    if (programFiles != null) {
+      File programFilesI2P = new File(programFiles, "i2p/i2p.exe");
+      if (programFilesI2P.exists())
+        return programFilesI2P.getAbsolutePath();
+    }
+    String programFiles86 = System.getenv("PROGRAMFILES86");
+    if (programFiles86 != null) {
+      File programFiles86I2P = new File(programFiles86, "i2p/i2p.exe");
+      if (programFiles86I2P.exists())
+        return programFiles86I2P.getAbsolutePath();
+    }
+    return null;
+  }
+
+  public boolean checkProgramFilesInstall() {
+    String programFiles = System.getenv("PROGRAMFILES");
+    if (programFiles != null) {
+      File programFilesI2P = new File(programFiles, "i2p/i2p.exe");
+      if (programFilesI2P.exists())
+        return true;
+    }
+    String programFiles86 = System.getenv("PROGRAMFILES86");
+    if (programFiles86 != null) {
+      File programFiles86I2P = new File(programFiles86, "i2p/i2p.exe");
+      if (programFiles86I2P.exists())
+        return true;
+    }
+    return false;
+  }
+
+  public boolean promptUserInstallStartIfAvailable() {
+    if (osName() != "windows") {
+      return true;
+    }
+    if (checkProgramFilesInstall()) {
+      int a;
+      String message =
+          "It appears you have an existing, unbundled I2P rotuer installed.\n";
+      message +=
+          "However, it is not running yet. Please start it using the shortcut on the desktop.\n";
+      message +=
+          "If you click \"No\", the Easy-Install router will be launched instead.\n";
+      a = JOptionPane.showConfirmDialog(null, message,
+                                        "I2P Service detected not running",
+                                        JOptionPane.YES_NO_OPTION);
+      if (a == JOptionPane.NO_OPTION) {
+        // Do nothing here, this will continue on to launch a jpackaged router
+        return true;
+      } else {
+        try {
+          String pfi = getProgramFilesInstall();
+          if (pfi != null)
+            Runtime.getRuntime().exec(new String[] {pfi});
+        } catch (IOException e) {
+          return false;
+        }
+        return true;
+      }
+    }
+    return true;
+  }
+
+  /**
+   * get the path to the binary of the app-image root by getting the path to
+   * java.home and the OS, and traversing up to the app-image root based on that
+   * information, then getting the binary path on a per-platform basis. The path
+   * returned will be relative to the root.
+   *
+   * @return the app-image root
+   */
+  protected String appImageExe() {
+    File aih = appImageHome();
+    if (aih != null) {
+      // get the name of the aih directory itself, which will be the default
+      // name of the executable as well
+      String baseName = "I2P";
+      switch (osName()) {
+      case "windows":
+        return baseName + ".exe";
+      case "mac":
+      case "linux":
+        return "./bin/" + baseName;
+      }
+    }
+    return null;
+  }
+}

java/net/i2p/router/WinLauncher.java

@@ -24,7 +24,7 @@ import net.i2p.util.Log;
  * appdata
  * router.pid - the pid of the java process.
  */
-public class WinLauncher extends WindowsAppUtil {
+public class WinLauncher extends I2PAppUtil {
   private final CopyConfigDir copyConfigDir;
   WinUpdatePostProcessor wupp = null;
   private Router i2pRouter;
@@ -56,7 +56,7 @@ public class WinLauncher extends WindowsAppUtil {
     var launcher = new WinLauncher();
     launcher.setupLauncher();
     int proxyTimeoutTime = 200;
-    
+
     launcher.logger.info("\t" + System.getProperty("user.dir"));
     launcher.logger.info("\t" + System.getProperty("i2p.dir.base"));
     launcher.logger.info("\t" + System.getProperty("i2p.dir.config"));
@@ -104,7 +104,7 @@ public class WinLauncher extends WindowsAppUtil {
   }
 
   private File programFile() {
-    File programs = selectProgramFile();
+    File programs = selectHome();
     if (!programs.exists())
       programs.mkdirs();
     else if (!programs.isDirectory()) {

java/net/i2p/router/WindowsAppUtil.java

@@ -17,17 +17,9 @@ public class WindowsAppUtil extends WindowsServiceUtil {
     }
     return null;
   }
-  
-  protected File selectHome() { // throws Exception {
-    File i2p = checkPathEnvironmentVariable("I2P_CONFIG");
-    String path_override = System.getenv("I2P_CONFIG");
-    if (i2p == null)
-      i2p = appImageHome();
-    return i2p;
-  }
 
-  protected File selectProgramFile() {
-    File i2p = checkPathEnvironmentVariable("I2P");
+  protected File selectHome() { // throws Exception {
+    File i2p = checkPathEnvironmentVariable("JPACKAGE_HOME");
     if (i2p == null)
       i2p = appImageHome();
     return i2p;
@@ -90,12 +82,15 @@ public class WindowsAppUtil extends WindowsServiceUtil {
   protected String appImageExe() {
     File aih = appImageHome();
     if (aih != null) {
+      // get the name of the aih directory itself, which will be the default
+      // name of the executable as well
+      String baseName = aih.getName();
       switch (osName()) {
       case "windows":
-        return "I2P.exe";
+        return baseName + ".exe";
       case "mac":
       case "linux":
-        return "./bin/I2P";
+        return "./bin/" + baseName;
       }
     }
     return null;

java/net/i2p/router/WindowsServiceUtil.java

@@ -145,87 +145,13 @@ public class WindowsServiceUtil {
             return false;
           }
         }
-        return isStart("i2p");
+        return isStart(serviceName);
       }
       return true;
     }
     return true;
   }
 
-  public String ServiceUpdaterString() {
-    return "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/news.su3";
-  }
-  public String ServiceBackupUpdaterString() {
-    return "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news.su3";
-  }
-  public String ServiceStaticUpdaterString() {
-    return "http://echelon.i2p/i2p/i2pupdate.sud,http://stats.i2p/i2p/i2pupdate.sud";
-  }
-
-  public String getProgramFilesInstall() {
-    String programFiles = System.getenv("PROGRAMFILES");
-    if (programFiles != null) {
-      File programFilesI2P = new File(programFiles, "i2p/i2p.exe");
-      if (programFilesI2P.exists())
-        return programFilesI2P.getAbsolutePath();
-    }
-    String programFiles86 = System.getenv("PROGRAMFILES86");
-    if (programFiles86 != null) {
-      File programFiles86I2P = new File(programFiles86, "i2p/i2p.exe");
-      if (programFiles86I2P.exists())
-        return programFiles86I2P.getAbsolutePath();
-    }
-    return null;
-  }
-
-  public boolean checkProgramFilesInstall() {
-    String programFiles = System.getenv("PROGRAMFILES");
-    if (programFiles != null) {
-      File programFilesI2P = new File(programFiles, "i2p/i2p.exe");
-      if (programFilesI2P.exists())
-        return true;
-    }
-    String programFiles86 = System.getenv("PROGRAMFILES86");
-    if (programFiles86 != null) {
-      File programFiles86I2P = new File(programFiles86, "i2p/i2p.exe");
-      if (programFiles86I2P.exists())
-        return true;
-    }
-    return false;
-  }
-
-  public boolean promptUserInstallStartIfAvailable() {
-    if (osName() != "windows") {
-      return true;
-    }
-    if (checkProgramFilesInstall()) {
-      int a;
-      String message =
-          "It appears you have an existing, unbundled I2P rotuer installed.\n";
-      message +=
-          "However, it is not running yet. Please start it using the shortcut on the desktop.\n";
-      message +=
-          "If you click \"No\", the Easy-Install router will be launched instead.\n";
-      a = JOptionPane.showConfirmDialog(null, message,
-                                        "I2P Service detected not running",
-                                        JOptionPane.YES_NO_OPTION);
-      if (a == JOptionPane.NO_OPTION) {
-        // Do nothing here, this will continue on to launch a jpackaged router
-        return true;
-      } else {
-        try {
-          String pfi = getProgramFilesInstall();
-          if (pfi != null)
-            Runtime.getRuntime().exec(new String[] {pfi});
-        } catch (IOException e) {
-          return false;
-        }
-        return true;
-      }
-    }
-    return true;
-  }
-
   public String getServiceState(String serviceName) {
     String stateString = "uninstalled";
     int state = getServiceStateInt(serviceName);

src/win/torbrowser-windows.sh

@@ -24,4 +24,5 @@ fi
 
 gpgv --keyring ./tor.keyring "tor-browser-windows-x86_64-portable-${version}.exe.asc" "tor-browser-windows-x86_64-portable-${version}.exe"
 
-7z x "tor-browser-windows-x86_64-portable-${version}.exe" -o "Tor Browser"
+7z x "tor-browser-windows-x86_64-portable-${version}.exe" -o"Tor Browser"
+#7z --help