fix path for default plugin install

use i2p.plugins.firefox as a plugin instead of as a library
2024-03-08 15:06:30 -05:00 · 2024-03-08 14:54:39 -05:00 · 2024-03-08 11:58:49 -05:00 · 2024-03-07 22:31:18 -05:00 · 2024-03-07 22:18:41 -05:00 · 2024-03-07 21:21:01 -05:00
16 changed files with 262 additions and 61 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+* -text
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -0,0 +1,117 @@
+
+name: Java CI
+
+on: [push]
+
+jobs:
+
+  nsis:
+    runs-on: windows-latest
+    steps:
+      - uses: Vampire/setup-wsl@v3
+        with:
+          distribution: Ubuntu-20.04
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+          git config --global user.email "github@i2p.net"
+          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
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/unsigned.sh; ls *.exe"
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-Easy-Install-Bundle-unsigned.exe
+          path: I2P-Easy-Install-Bundle-2.4.0.exe
+
+  buildjpackagexe:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/exe.sh; ls *.exe"
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-EXE-unsigned.exe
+          path: I2P-EXE-2.4.0.exe
+
+  buildjpackagmsi:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/msi.sh; ls *.msi"
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.msi
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-MSI-unsigned.msi
+          path: I2P-MSI-2.4.0.msi
+
+  buildzip:
+    runs-on: windows-latest
+    steps:
+      - uses: Vampire/setup-wsl@v3
+        with:
+          distribution: Ubuntu-20.04
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+          git config --global user.email "github@i2p.net"
+          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
+      - run: choco install wget
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/zip.sh; ls *.zip"
+      - name: Upload I2P-windows-portable.zip
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-windows-portable.zip
+          path: I2P-windows-portable.zip
+        
+  buildtgz:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - run: |
+          sudo apt-get update
+          sudo apt-get install -y nsis nsis-common nsis-pluginapi wget dos2unix curl jq gpg gettext
+      - name: build with script
+        run: ./buildscripts/targz.sh; ls *.tar.gz
+      - name: Upload I2P.tar.gz
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P.tar.gz
+          path: I2P.tar.gz
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -0,0 +1,79 @@
+name: Release
+
+#on: [push]
+
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - 'i2p-firefox-*.*.*' # Release i2p-firefox-1.2.3
+      - 'i2p-firefox-*.*.*-*' # Release i2p-firefox-1.2.3
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            changelog.txt
+          sparse-checkout-cone-mode: false
+      - name: sleep 15 minutes
+        run: |
+          echo "sleeping 15 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 14 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 13 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 12 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 11 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 10 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 9 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 8 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 7 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 6 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 5 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 4 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 3 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 2 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 1 minutes to wait for artifacts"
+          sleep 1m
+      - name: Download artifacts
+        id: download-artifact
+        uses: dawidd6/action-download-artifact@v3
+        with:
+          skip_unpack: true
+          workflow: ant.yml
+          if_no_artifact_found: fail
+      # remove .zip file extension
+      - run: for f in *.zip; do unzip "$f"; rm "$f"; done
+      - run: echo "" | tee -a changelog.txt
+      - run: echo "## Checksums" | tee -a changelog.txt
+      - run: echo "" | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: sha256sum * | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: echo "" | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: file * | tee -a changelog.txt
+      - run: echo '```' | tee -a changelog.txt
+      - run: echo "" | tee -a changelog.txt
+      - name: Upload artifacts
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "*"
+          bodyFile: "changelog.txt"
--- a/buildscripts/exe.sh
+++ b/buildscripts/exe.sh
@@ -7,7 +7,7 @@ cd "$SCRIPT_DIR" || exit 1

 . ./config.sh
 . ./i2pversion
-./build.sh
+./buildscripts/build.sh
 jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
    --verbose \
    --java-options "-Xmx512m" \
--- a/buildscripts/launcher.sh
+++ b/buildscripts/launcher.sh
@@ -95,15 +95,25 @@ mkdir -p "$SCRIPT_DIR/build"
 cp "$I2P_JARS"/*.jar "$SCRIPT_DIR/build"
 cp "$I2P_JBIGI_JAR" "$SCRIPT_DIR/build"
 if [ ! -f "$SCRIPT_DIR/build/jna.jar" ]; then
-  wget "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar" -O "$SCRIPT_DIR/build/jna.jar"
+  echo "downloading jna"
+  wget_download "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar" -O "$SCRIPT_DIR/build/jna.jar"
 fi

 if [ ! -f "$SCRIPT_DIR/build/jna-platform.jar" ]; then
-  wget "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar" -O "$SCRIPT_DIR/build/jna-platform.jar"
+  echo "downloading jna-platform"
+  wget_download "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar" -O "$SCRIPT_DIR/build/jna-platform.jar"
 fi

-if [ ! -f "$SCRIPT_DIR/build/i2pfirefox.jar" ]; then
-  wget "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar" -O "$SCRIPT_DIR/build/i2pfirefox.jar"
+if [ ! -f "$SCRIPT_DIR/build/i2pfirefox.zip" ]; then
+  echo "downloading i2pfirefox jars"
+  wget_download "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/plugin.zip" -O "$SCRIPT_DIR/build/i2pfirefox.zip"
+fi
+
+if [ ! -d "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox" ]; then
+  mkdir -p "$SCRIPT_DIR/build/I2P/config/plugins/"
+  unzip "$SCRIPT_DIR/build/i2pfirefox.zip" -d "$SCRIPT_DIR/build/I2P/config/plugins/"
+  rm -rf "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox"
+  mv "$SCRIPT_DIR/build/I2P/config/plugins/plugin" "$SCRIPT_DIR/build/I2P/config/plugins/i2pfirefox"
 fi

 for dll in "$I2P_JBIGI/"*windows*.dll; do
--- a/buildscripts/release-support.sh
+++ b/buildscripts/release-support.sh
--- a/buildscripts/release-torrent.sh
+++ b/buildscripts/release-torrent.sh
@@ -30,6 +30,7 @@ fi
 cp -v "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" "I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe"
 java -cp "$I2P_LIBS/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe I2P-Easy-Install-Bundle-$I2P_VERSION-signed.su3 "$HOME/.i2p-plugin-keys/news-su3-keystore.ks" $I2P_VERSION $SIGNER
 rm -f i2pwinupdate.su3.torrent
+cp -v I2P-Easy-Install-Bundle-$I2P_VERSION-signed.su3 i2pwinupdate.su3
 mktorrent \
 		--announce=http://tracker2.postman.i2p/announce.php \
 		--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
--- a/buildscripts/release-upload.sh
+++ b/buildscripts/release-upload.sh
@@ -51,5 +51,23 @@ 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 "$I2P_VERSION" -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 "$I2P_VERSION" -n "i2p.i2p.jpackage-build.tar.gz"
 sh -c "powershell Compress-Archive I2P I2P-jpackage-windows-$I2P_VERSION.zip || zip I2P-jpackage-windows-$I2P_VERSION.zip -r I2P"
-echo github-release upload -R -u "$GITHUB_USERNAME" -r i2p -t "i2p.firefox" -n "i2p-jpackage-windows-$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
-github-release upload -R -u "$GITHUB_USERNAME" -r i2p -t "i2p.firefox" -n "i2p-jpackage-windows-$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p-jpackage-windows-$I2P_VERSION.zip" -t "$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p-jpackage-windows-$I2P_VERSION.zip" -t "$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
+
+GITHUB_USERNAME=i2p
+echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$I2P_VERSION" -d "$DESCRIPTION" -t "$I2P_VERSION"
+github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$I2P_VERSION" -d "$DESCRIPTION" -t "$I2P_VERSION"
+sleep 2s;
+EXECHECKSUM=$(sha256sum "I2P-Easy-Install-Bundle-$I2P_VERSION.exe")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -l "$EXECHECKSUM" -t "$I2P_VERSION" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -l "$EXECHECKSUM" -t "$I2P_VERSION" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+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 "$I2P_VERSION" -n "I2P.zip"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.zip" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -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 "$I2P_VERSION" -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 "$I2P_VERSION" -n "i2p.i2p.jpackage-build.tar.gz"
+sh -c "powershell Compress-Archive I2P I2P-jpackage-windows-$I2P_VERSION.zip || zip I2P-jpackage-windows-$I2P_VERSION.zip -r I2P"
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p-jpackage-windows-$I2P_VERSION.zip" -t "$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p-jpackage-windows-$I2P_VERSION.zip" -t "$I2P_VERSION" -f "./I2P-jpackage-windows-$I2P_VERSION.zip"
--- a/buildscripts/unsigned.sh
+++ b/buildscripts/unsigned.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash

 SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
-cd "$SCRIPT_DIR" || exit 1
+cd "$SCRIPT_DIR" || cd ../ ; SCRIPT_DIR=$(pwd)

 . "$SCRIPT_DIR/config.sh"

--- a/buildscripts/zip.sh
+++ b/buildscripts/zip.sh
@@ -1,7 +1,7 @@
 #! /usr/bin/env bash

 SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
-cd "$SCRIPT_DIR" || exit 1
+cd "$SCRIPT_DIR" || cd ../ ; SCRIPT_DIR=$(pwd)

 . "$SCRIPT_DIR/config.sh"

@@ -16,7 +16,7 @@ TORSOCKS=$(which torsocks)
 if [ -f "${TORSOCKS}" ]; then
    . "${TORSOCKS}" on
 fi
-"$SCRIPT_DIR"/src/win/torbrowser-windows.sh
+#"$SCRIPT_DIR"/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
@@ -28,5 +28,6 @@ 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
+
+which zip && zip -r I2P-windows-portable.zip I2P-portable
+which zip || powershell Compress-Archive -force I2P-portable I2P-windows-portable.zip
--- a/config.sh
+++ b/config.sh
@@ -39,9 +39,9 @@ NSIS_PATH="/c/Program Files (x86)/NSIS/Bin"
 PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
 export PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"

-wget(){
+wget_download(){
    which powershell && powershell Invoke-WebRequest $@ && return
-    which wget && wget $@ && return
+    wget $@
 }

 makensisi(){
@@ -49,7 +49,7 @@ makensisi(){
    which wsl && wsl makensis $@ && return
 }

-make(){
+make_make(){
    which make && make $@ && return
    which wsl && wsl make $@ && return
 }
@@ -123,6 +123,12 @@ if [ -d "/c/apache-ant-"* ]; then
    export PATH="$PATH:$ANT_HOME/bin/"
 fi

+if [ -d "/c/mktorrent"* ]; then
+    MKTORRENT_HOME=$(ls -d /c/mktorrent*)
+    export MKTORRENT_HOME="$MKTORRENT_HOME"
+    export PATH="$PATH:$MKTORRENT_HOME/bin/"
+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/"
--- a/10
+++ b/10
@@ -2,14 +2,14 @@

 JNA_VERSION=5.12.1
 export JNA_VERSION=5.12.1
-I2PFIREFOX_VERSION=1.0.9
-export I2PFIREFOX_VERSION=1.0.9
+I2PFIREFOX_VERSION=1.4.7
+export I2PFIREFOX_VERSION=1.4.7
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
 VERSIONMAJOR=2
-VERSIONMINOR=3
+VERSIONMINOR=4
 VERSIONBUILD=0
 I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
-VERSION=i2p-2.3.0
-export VERSION=i2p-2.3.0
+VERSION=i2p-2.4.0
+export VERSION=i2p-2.4.0
--- a/java/net/i2p/router/WinLauncher.java
+++ b/java/net/i2p/router/WinLauncher.java
@@ -10,7 +10,7 @@ import java.util.logging.Logger;
 import java.util.logging.SimpleFormatter;
 import net.i2p.app.ClientAppManager;
 import net.i2p.crypto.*;
-import net.i2p.i2pfirefox.*;
+//import net.i2p.i2pfirefox.*;
 import net.i2p.router.Router;
 import net.i2p.router.RouterLaunch;
 import net.i2p.update.*;
@@ -36,9 +36,6 @@ public class WinLauncher extends CopyConfigDir {
    var launcher = new WinLauncher();
    launcher.setupLauncher();
    launcher.initLogger();
-    int privateBrowsing = 0;
-    boolean usabilityMode = false;
-    boolean chromiumFirst = false;
    int proxyTimeoutTime = 200;
    ArrayList<String> newArgsList = new ArrayList<String>();

@@ -46,14 +43,11 @@ public class WinLauncher extends CopyConfigDir {
      if (args.length > 0) {
        for (String arg : args) {
          if (arg.equals("-private")) {
-            privateBrowsing = 1;
            launcher.logger.info(
                "Private browsing is true, profile will be discarded at end of session.");
          } else if (arg.equals("-chromium")) {
-            chromiumFirst = true;
            launcher.logger.info("Chromium will be selected before Firefox.");
          } else if (arg.equals("-usability")) {
-            usabilityMode = true;
            launcher.logger.info(
                "Usability mode is true, using alternate extensions loadout.");
          } else if (arg.equals("-noproxycheck")) {
@@ -124,10 +118,6 @@ public class WinLauncher extends CopyConfigDir {
      System.exit(1);
    }

-    if (launcher.launchBrowser(privateBrowsing, usabilityMode, chromiumFirst,
-                               proxyTimeoutTime, newArgsList)) {
-      System.exit(0);
-    }
    launcher.i2pRouter =
        new Router(launcher.routerConfig(), System.getProperties());
    if (!launcher.isInstalled("i2p")) {
@@ -186,29 +176,6 @@ public class WinLauncher extends CopyConfigDir {
    return home;
  }

-  private boolean launchBrowser(int privateBrowsing, boolean usabilityMode,
-                                boolean chromiumFirst, int proxyTimeoutTime,
-                                ArrayList<String> newArgsList) {
-    if (i2pIsRunning()) {
-      logger.info("I2P is already running, launching an I2P browser");
-      I2PBrowser i2pBrowser = new I2PBrowser();
-      i2pBrowser.usability = usabilityMode;
-      i2pBrowser.chromiumFirst = chromiumFirst;
-      i2pBrowser.firefox = !chromiumFirst;
-      i2pBrowser.chromium = chromiumFirst;
-      if (chromiumFirst) {
-        logger.warning("favoring Chromium instead of Firefox");
-      }
-      i2pBrowser.setProxyTimeoutTime(proxyTimeoutTime);
-      System.out.println("I2PBrowser");
-      String[] newArgs = newArgsList.toArray(new String[newArgsList.size()]);
-      setNotStarting();
-      i2pBrowser.launch(privateBrowsing, newArgs);
-      return true;
-    }
-    return false;
-  }
-
  // see
  // https://stackoverflow.com/questions/434718/sockets-discover-port-availability-using-java
  private boolean isAvailable(int portNr) {
--- a/java/net/i2p/router/WindowsServiceUtil.java
+++ b/java/net/i2p/router/WindowsServiceUtil.java
@@ -260,7 +260,7 @@ public class WindowsServiceUtil {
   *
   * @return os name in lower-case, "windows" "mac" or  "linux"
   */
-  protected static String osName() {
+  protected String osName() {
    String osName = System.getProperty("os.name").toLowerCase();
    if (osName.contains("windows"))
      return "windows";
--- a/src/nsis/i2pbrowser-version.nsi
+++ b/src/nsis/i2pbrowser-version.nsi
@@ -1,3 +1,3 @@
 !define VERSIONMAJOR 2
-!define VERSIONMINOR 2
-!define VERSIONBUILD 1
+!define VERSIONMINOR 4
+!define VERSIONBUILD 0
--- a/src/unix/torbrowser.sh
+++ b/src/unix/torbrowser.sh
@@ -18,10 +18,11 @@ if [ ! -f ./tor.keyring ]; then
 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"
+    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
+    https://dist.torproject.org/torbrowser/13.0.9/
+    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.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-linux-x86_64-${version}.tar.xz.asc" "tor-browser-linux-x86_64-${version}.tar.xz"

-tar xvJf "tor-browser-linux64-${version}_${locale}.tar.xz"
+tar xvJf "tor-browser-linux-x86_64-${version}.tar.xz"
Author	SHA1	Message	Date
eyedeekay	a4476dc990	fix path for default plugin install	2024-03-08 15:06:30 -05:00
eyedeekay	1e959d0aa1	fix path for default plugin install	2024-03-08 14:54:39 -05:00
eyedeekay	8f6e7bc83c	use i2p.plugins.firefox as a plugin instead of as a library	2024-03-08 11:58:49 -05:00
eyedeekay	fc84098dc9	use i2p.plugins.firefox as a plugin instead of as a library	2024-03-07 22:31:18 -05:00
eyedeekay	52a33b5334	zip during run phase	2024-03-07 22:18:41 -05:00
eyedeekay	e055eb8aa9	don't skip unpacking	2024-03-07 21:21:01 -05:00
eyedeekay	8d1eb7e01f	remove shasums from ci artifact names	2024-03-07 20:57:38 -05:00
eyedeekay	ab1d7047ca	do releases builds with CI here too	2024-03-07 16:33:12 -05:00
eyedeekay	9a190ae75d	do releases builds with CI here too	2024-03-07 16:28:57 -05:00
eyedeekay	38aa89e586	remove browser launcher from win launcher	2024-03-06 14:54:31 -05:00
eyedeekay	9b10707f14	use powershell-zip if zip isn't around	2024-02-20 17:11:06 -05:00
eyedeekay	79f3337056	don't run tbb script on Windows	2024-02-20 17:06:06 -05:00
eyedeekay	7a550091f2	try chocowget for zip	2024-02-20 16:51:39 -05:00
eyedeekay	4767e1fba2	make sure we're in wsl with zip	2024-02-20 16:37:39 -05:00
eyedeekay	ef99328eed	add zip to wsl env in buildzip	2024-02-20 16:04:06 -05:00
eyedeekay	936966ee4c	use choco to install wget	2024-02-20 15:13:55 -05:00
eyedeekay	07aed0ab00	use choco to install wget	2024-02-20 14:52:22 -05:00
eyedeekay	d70eb26dbf	use wsl-bash to generate zip	2024-02-20 14:44:03 -05:00
eyedeekay	df2802bf5d	fix path for dev build artifact upload	2024-02-20 14:41:03 -05:00
eyedeekay	4fdc0a5dc9	set up git config in container	2024-02-20 14:28:49 -05:00
eyedeekay	e619b3fd19	pass -c	2024-02-20 14:18:37 -05:00
eyedeekay	e1e61ec7b2	use winbash to run buildscripts	2024-02-20 14:06:06 -05:00
eyedeekay	3d7444e33e	use git-bash to run buildscripts	2024-02-20 11:38:31 -05:00
eyedeekay	b75da98147	use wsl-bash to run buildscripts	2024-02-20 10:52:19 -05:00
eyedeekay	3d70bc5e59	use git-bash to run buildscripts	2024-02-20 10:45:58 -05:00
eyedeekay	ab7b24bb0d	call wsl not wsl-bash when using apt-get	2024-02-20 10:39:44 -05:00
eyedeekay	9baefba911	don't auto-select wsl-bash	2024-02-20 10:36:12 -05:00
eyedeekay	f48d8017c5	add .gitattributes	2024-02-20 09:47:13 -05:00
eyedeekay	d01d0bb513	force unix line endings	2024-02-19 19:09:46 -05:00
eyedeekay	5e26057f9c	force unix line endings	2024-02-19 19:02:43 -05:00
eyedeekay	8be149e02f	use checkout earlier	2024-02-19 18:46:19 -05:00
eyedeekay	d73832f1f6	dos2unix everything in wsl	2024-02-19 18:12:36 -05:00
eyedeekay	a7ae0ec8f7	dos2unix everything in wsl	2024-02-19 17:17:26 -05:00
eyedeekay	6ec4834a08	work around error that happens in nsis	2024-02-19 17:04:46 -05:00
eyedeekay	82d111d598	work around error that happens in nsis	2024-02-19 16:58:47 -05:00
eyedeekay	2ed7e7ef98	work around error that happens in nsis	2024-02-19 16:48:59 -05:00
eyedeekay	bdf8715ce5	fix syntax error on nsis target	2024-02-19 16:41:58 -05:00
eyedeekay	175e811ac3	don't try and specify a shell	2024-02-19 16:37:14 -05:00
eyedeekay	b3ff9d50f8	don't try and specify a shell	2024-02-19 16:35:11 -05:00
eyedeekay	31135cc664	don't look for .tgz's pointlessly	2024-02-19 16:33:23 -05:00
eyedeekay	5c91612f90	try and fix nsis target	2024-02-19 16:32:10 -05:00
eyedeekay	c65df41f76	fix TBB download script for unix portable target	2024-02-19 16:27:51 -05:00
eyedeekay	1a78538525	pass -y flag	2024-02-19 16:16:34 -05:00
eyedeekay	8ec161aceb	needs more gettext	2024-02-19 16:15:11 -05:00
eyedeekay	c76541979a	run apt-get update first	2024-02-19 16:08:46 -05:00
eyedeekay	6f14dc1a3a	use sudo in ubuntu container	2024-02-19 16:07:35 -05:00
eyedeekay	7a32f97f29	install deps in ubuntu container also	2024-02-19 16:05:24 -05:00
eyedeekay	790300e996	set default shell to wsl-bash	2024-02-19 16:03:04 -05:00
eyedeekay	6a4aa0b74c	Work on getting portable and nsis builds to work	2024-02-19 15:57:31 -05:00
eyedeekay	32e26956bf	Build all potential jpackage targets in CI	2024-02-19 15:42:45 -05:00
eyedeekay	b8c1c44e66	Install Ubuntu-20.04 in wsl in CI so we can do the whole build process for all windows platforms	2024-02-19 15:32:52 -05:00
eyedeekay	0a52d64847	switch back to what works for tonight	2024-02-01 22:05:23 -05:00
eyedeekay	23e77ef901	list users, then fail to install Ubuntu as admin	2024-02-01 21:13:16 -05:00
eyedeekay	3f419675fe	set i2pversion not config.sh	2024-02-01 21:11:43 -05:00
eyedeekay	99a779d89f	set i2pversion not config.sh	2024-02-01 18:40:08 -05:00
eyedeekay	2ce03a426c	set i2pversion not config.sh	2024-02-01 17:54:47 -05:00
eyedeekay	ab9965e0b8	don't worry about wsl for now	2024-02-01 17:31:22 -05:00
eyedeekay	6491551577	diverges enough for the comment to be erroneous	2024-02-01 17:30:31 -05:00
eyedeekay	ec13b0f94b	try to fix artifact upload	2024-02-01 17:29:46 -05:00
eyedeekay	11b7096fa5	try to fix config.sh in CI	2024-02-01 17:28:46 -05:00
eyedeekay	1959aac3a8	try to fix config.sh in CI	2024-02-01 17:17:45 -05:00
eyedeekay	1414fe3b53	try to fix config.sh in CI	2024-02-01 17:13:07 -05:00
eyedeekay	03a3487aa7	try to fix config.sh in CI	2024-02-01 17:11:56 -05:00
eyedeekay	bb55985bb8	try to fix config.sh in CI	2024-02-01 17:10:11 -05:00
eyedeekay	95fbcde2dc	try to fix config.sh in CI	2024-02-01 17:08:10 -05:00
eyedeekay	157821ef91	install dos2unix in CI	2024-02-01 17:05:46 -05:00
eyedeekay	371428e03c	install nsis in CI	2024-02-01 17:04:58 -05:00
eyedeekay	9e90df0181	fix config setup	2024-02-01 17:03:03 -05:00
eyedeekay	893f1f9043	call build.sh in correct location	2024-02-01 17:00:43 -05:00
eyedeekay	d76c1ff567	fix config setup	2024-02-01 16:58:13 -05:00
eyedeekay	56be9ed3e0	fix config setup	2024-02-01 16:56:19 -05:00
eyedeekay	e3e19ca4d4	see if jpackage can generate an exe	2024-02-01 16:54:52 -05:00
eyedeekay	144e6ba9e0	call bash specifically	2024-02-01 16:36:35 -05:00
eyedeekay	b2fdfc1e89	install wsl in runner	2024-02-01 16:34:42 -05:00
eyedeekay	b1db589787	set up runner that definitely won't work yet	2024-02-01 16:23:09 -05:00
eyedeekay	a3da3c2ace	update version numbers 2.4.0	2023-12-11 13:54:41 -05:00
eyedeekay	5e27d8588a	update version numbers, don't have osname be static	2023-12-11 13:53:14 -05:00
eyedeekay	2a185f5fe3	Detect mktorrent if it exists on Windows	2023-07-10 20:18:53 -04:00
eyedeekay	f0f194242b	add tag to last element in github upload script	2023-07-10 20:00:36 -04:00
eyedeekay	b9c6b6db49	add i2p org to github upload script	2023-07-10 19:28:20 -04:00
eyedeekay	c14077606b	fix upload script	2023-07-10 19:21:49 -04:00
eyedeekay	f53a7759e4	update versions	2023-07-10 15:16:06 -04:00