do releases builds with CI here too

remove browser launcher from win launcher
2024-03-07 16:33:12 -05:00 · 2024-03-07 16:28:57 -05:00 · 2024-03-06 14:54:31 -05:00 · 2024-02-20 17:11:06 -05:00 · 2024-02-20 17:06:06 -05:00 · 2024-02-20 16:51:39 -05:00
27 changed files with 557 additions and 224 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-${{ github.sha }}-unsigned.exe
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-Easy-Install-Bundle-${{ github.sha }}-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-${{ github.sha }}-unsigned.exe
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-EXE-${{ github.sha }}-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-${{ github.sha }}-unsigned.msi
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-MSI-${{ github.sha }}-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-${{ github.sha }}.zip
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-windows-portable-${{ github.sha }}.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-${{ github.sha }}.tar.gz
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-${{ github.sha }}.tar.gz
+          path: I2P.tar.gz
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -0,0 +1,75 @@
+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 mv "$f" "${f%.zip}"; 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
+      - name: Upload artifacts
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "*"
+          bodyFile: "changelog.txt"
--- a/.gitignore
+++ b/.gitignore
@ -25,4 +25,7 @@ config_override.sh
 i2pkeys
 onionkeys
 tlskeys
-tmp
+tmp
+/.stfolder/
+/.vscode/
+*github-release-config*.sh*
--- a/46
+++ b/46
@ -0,0 +1,46 @@
+FROM debian:sid
+
+## Originally found at: https://yusuke.blog/2021/10/19/3149 and updated to Java 20.
+## This does not work yet.
+
+RUN dpkg --add-architecture i386
+RUN apt-get update
+RUN apt-get install -y curl fakeroot unzip gnupg dos2unix make nsis* dos2unix curl jq
+
+# install JDK
+RUN curl --output /opt/java20.zip https://download.java.net/java/GA/jdk20.0.1/b4887098932d415489976708ad6d1a4b/9/GPL/openjdk-20.0.1_windows-x64_bin.zip \
+    && cd /opt/  \
+    && unzip java20.zip \
+    && rm java20.zip 
+ENV JAVA_HOME /opt/jdk-20.0.1
+
+# install Wine
+RUN apt-get update
+RUN apt install --install-recommends  wine wine64* wine-binfmt fonts-wine -y
+RUN wine --version
+RUN wine wineboot --init
+
+# install WIX TOOLSET
+RUN mkdir /opt/wix311 \
+    && cd /opt/wix311  \
+    && curl -L --output /opt/wix311/wix311.zip https://github.com/wixtoolset/wix3/releases/download/wix3112rtm/wix311-binaries.zip  \
+    && unzip wix311.zip \
+    && rm wix311.zip
+    
+# WIX TOOLSET is requring .NET.
+RUN curl --output winetricks https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks &&\
+    chmod +x winetricks && \
+    mv -v winetricks /usr/local/bin
+
+# DONNO why dotnet48 installation fails with "warning: exit status 5 - user selected 'Cancel' "
+# https://forum.winehq.org/viewtopic.php?f=8&t=35724
+#ENV WINEPREFIX=/dotnet-test
+#RUN /usr/local/bin/winetricks --optout -q dotnet48
+
+ENV WINEPATH /opt/jdk-20.0.1/bin\;/opt/wix311
+
+WORKDIR /root
+COPY . /root
+RUN echo "wine /opt/jdk-20.0.1/bin/jpackage.exe $@" > /opt/jdk-20.0.1/bin/jpackage
+RUN chmod +x /opt/jdk-20.0.1/bin/jpackage
+CMD ./buildscripts/build.sh
--- a/54
+++ b/54
@ -14,29 +14,19 @@ all: version install.exe
 fmt:
 	find . -name '*.java' -exec clang-format -i {} \;

-tag:
-	git tag $(PROFILE_VERSION)
-
 version:
 	./buildscripts/version.sh

-jpackage: version I2P build/I2P/config all
+jpackage: version I2P build/I2P all

 help: version
 	@echo "I2P-Easy-Install-Bundle-$(PROFILE_VERSION)"
-	@echo "$(SIGNER)"
 	@echo "$(I2P_VERSION)"
 	@echo "$(MAJOR).$(MINOR).$(BUILD)"
 	@echo "$(preset)"

-prep:
-
 install.exe:
-	./buildscripts/nsis.sh
-
-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"
+	./buildscripts/unsigned.sh

 distclean: clean
 	rm -rf I2P
@ -45,10 +35,9 @@ I2P:
 	./buildscripts/build.sh

 build/I2P: I2P build
+	cp -v I2P build/I2P

-src/I2P/config:
-
-build/I2P/config: src/I2P/config build/I2P
+build/I2P: build/I2P

 #
 # Warning: a displayed license file of more than 28752 bytes
@ -65,38 +54,3 @@ build:
 	@echo "creating build directory"
 	mkdir -p build

-include makefiles/su.mk
-
-include makefiles/su-unsigned.mk
-
-I2P_DATE=`date +%Y-%m-%d`
-
-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`
-
-I2P.zip: I2P-jpackage-windows-$(I2P_VERSION).zip
-
-I2P-jpackage-windows-$(I2P_VERSION).zip:
-	sh -c 'powershell Compress-Archive I2P I2P-jpackage-windows-$(I2P_VERSION).zip || zip I2P-jpackage-windows-$(I2P_VERSION).zip -r I2P'
-
-changelog:
-	head -n "$(BLANK)" changelog.txt
-
-release-jpackage: I2P-jpackage-windows-$(I2P_VERSION).zip
-	head -n "$(BLANK)" changelog.txt | gothub release -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true
-
-update-release-jpackage:
-	head -n "$(BLANK)" changelog.txt | gothub edit -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true
-
-delete-release-jpackage:
-	gothub delete -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION); true
-
-upload-release-jpackage:
-	gothub upload -R -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n "i2p-jpackage-windows-$(I2P_VERSION)" -f "./I2P-jpackage-windows-$(I2P_VERSION).zip"
-
-jpackage-release: release-jpackage upload-release-jpackage
--- 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,18 @@ 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 -O "$SCRIPT_DIR/build/jna.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.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 -O "$SCRIPT_DIR/build/jna-platform.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.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 -O "$SCRIPT_DIR/build/i2pfirefox.jar" "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar"
+  echo "downloading i2pfirefox jars"
+  wget_download "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar" -O "$SCRIPT_DIR/build/i2pfirefox.jar"
 fi

 for dll in "$I2P_JBIGI/"*windows*.dll; do
@ -111,7 +114,7 @@ for dll in "$I2P_JBIGI/"*windows*.dll; do
 done

 cd "$SCRIPT_DIR"/java
-"$JAVA_HOME"/bin/javac -Xlint:deprecation -d ../build -classpath "$SCRIPT_DIR/build/i2pfirefox.jar:$SCRIPT_DIR/build/jna.jar":"$SCRIPT_DIR/build/jna-platform.jar":"$SCRIPT_DIR/build/i2p.jar":"$SCRIPT_DIR/build/router.jar":"$SCRIPT_DIR/build/routerconsole.jar":"$SCRIPT_DIR/build/jbigi.jar" \
+"$JAVA_HOME"/bin/javac -Xlint:deprecation -d ../build -classpath "$SCRIPT_DIR/build/i2pfirefox.jar:$SCRIPT_DIR/build/jna.jar:$SCRIPT_DIR/build/jna-platform.jar":"$SCRIPT_DIR/build/i2p.jar:$SCRIPT_DIR/build/router.jar:$SCRIPT_DIR/build/routerconsole.jar:$SCRIPT_DIR/build/jbigi.jar" \
  net/i2p/router/CopyConfigDir.java \
  net/i2p/router/WindowsServiceUtil.java \
  net/i2p/router/WindowsUpdatePostProcessor.java \
--- a/buildscripts/nsis.sh
+++ b/buildscripts/nsis.sh
@ -15,12 +15,7 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
  . "$SCRIPT_DIR/config_override.sh"
 fi

-MAKENSIS=$(which makensis)
-if [ -z "$MAKENSIS" ]; then
-    MAKENSIS="wsl makensis"
-fi
-
 cp "$SCRIPT_DIR"/src/nsis/*.nsi "$SCRIPT_DIR"/build
 cp "$SCRIPT_DIR"/src/nsis/*.nsh "$SCRIPT_DIR"/build
 cp "$SCRIPT_DIR"/src/icons/*.ico "$SCRIPT_DIR"/build
-cd "$SCRIPT_DIR"/build && $MAKENSIS i2pbrowser-installer.nsi && cp I2P-Easy-Install-Bundle-*.exe ../ && echo "built windows installer"
+cd "$SCRIPT_DIR"/build && makensisi i2pbrowser-installer.nsi && cp I2P-Easy-Install-Bundle-*.exe ../ && echo "built windows installer"
--- a/buildscripts/release-download.sh
+++ b/buildscripts/release-download.sh
@ -0,0 +1,42 @@
+#! /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
+
+mv "$SCRIPT_DIR/config_override.sh" "$SCRIPT_DIR/config_override.sh.bak"
+. "$SCRIPT_DIR/config.sh"
+
+### 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
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+
+
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "$I2P_VERSION"
+
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$I2P_VERSION"
+
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "$I2P_VERSION"
+
+echo github-release download -u "$GITHUB_USERNAME" -r i2p -t "$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
+github-release download -u "$GITHUB_USERNAME" -r i2p -t "$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
--- a/buildscripts/release-support.sh
+++ b/buildscripts/release-support.sh
@ -0,0 +1,50 @@
+#! /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
+
+mv "$SCRIPT_DIR/config_override.sh" "$SCRIPT_DIR/config_override.sh.bak"
+. "$SCRIPT_DIR/config.sh"
+
+### 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
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2pwinupdate.su3" -t "$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2pwinupdate.su3" -t "$I2P_VERSION"
+
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2pwinupdate.su3.torrent" -t "$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2pwinupdate.su3.torrent" -t "$I2P_VERSION"
+
+if [ ! -z "$I2P_SNARK_DIR" ]; then
+    if [ "$I2P_SNARK_DIR" = "$HOME/.i2p/i2psnark" ]; then
+        cp -v "i2pwinupdate.su3" "$I2P_SNARK_DIR"
+        cp -v "i2pwinupdate.su3.torrent" "$I2P_SNARK_DIR"
+    fi
+    if [ "$I2P_SNARK_DIR" = "$LOCALAPPDATA/i2p/i2psnark/" ]; then
+        cp -v "i2pwinupdate.su3" "$I2P_SNARK_DIR"
+        cp -v "i2pwinupdate.su3.torrent" "$I2P_SNARK_DIR"
+    fi
+    if [ "$I2P_SNARK_DIR" = "/var/lib/i2p/i2p-config/i2psnark/" ]; then
+        sudo cp -v "i2pwinupdate.su3" "$I2P_SNARK_DIR"
+        sudo cp -v "i2pwinupdate.su3.torrent" "$I2P_SNARK_DIR"
+        sudo chown i2psvc:i2psvc "$I2P_SNARK_DIR/i2pwinupdate.su3" "$I2P_SNARK_DIR/i2pwinupdate.su3.torrent"
+    fi
+fi
--- a/buildscripts/release-torrent.sh
+++ b/buildscripts/release-torrent.sh
@ -0,0 +1,44 @@
+#! /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
+
+mv "$SCRIPT_DIR/config_override.sh" "$SCRIPT_DIR/config_override.sh.bak"
+. "$SCRIPT_DIR/config.sh"
+
+### 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
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+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 \
+		--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
+		i2pwinupdate.su3
+ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3"
+ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3.torrent")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
--- a/buildscripts/release-upload.sh
+++ b/buildscripts/release-upload.sh
@ -0,0 +1,73 @@
+#! /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
+
+mv "$SCRIPT_DIR/config_override.sh" "$SCRIPT_DIR/config_override.sh.bak"
+. "$SCRIPT_DIR/config.sh"
+
+### 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 .
+"$SCRIPT_DIR"/buildscripts/unsigned.sh
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+BLANK=$(awk '! NF { print NR; exit }' changelog.txt)
+
+DESCRIPTION="Release build of i2p.firefox for $I2P_VERSION
+==========================================================
+
+$(head -n $BLANK changelog.txt)"
+
+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"
+
+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/targz.sh
+++ b/buildscripts/targz.sh
@ -10,7 +10,6 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
 fi
 export machine=unix
 "$SCRIPT_DIR"/buildscripts/clean.sh
-wsl "$SCRIPT_DIR"/buildscripts/clean.sh
 "$SCRIPT_DIR"/buildscripts/build.sh
 cd "$SCRIPT_DIR/I2P" || exit 1

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

@ -10,6 +10,5 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
 fi

 "$SCRIPT_DIR"/buildscripts/clean.sh
-wsl "$SCRIPT_DIR"/buildscripts/clean.sh
 "$SCRIPT_DIR"/buildscripts/build.sh
 "$SCRIPT_DIR"/buildscripts/nsis.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"

@ -9,7 +9,6 @@ if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
  . "$SCRIPT_DIR/config_override.sh"
 fi
 "$SCRIPT_DIR"/buildscripts/clean.sh
-wsl "$SCRIPT_DIR"/buildscripts/clean.sh
 "$SCRIPT_DIR"/buildscripts/build.sh
 cd "$SCRIPT_DIR/I2P" || exit 1

@ -17,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
@ -29,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/changelog.txt
+++ b/changelog.txt
@ -1,4 +1,4 @@
-2022-01-23 idk
+2023-01-23 idk
 * Move build scripts to their own directory and make them use correct paths when moved
 * Add EXTRA to router when generating embedded router jars.

--- a/config.sh
+++ b/config.sh
@ -5,24 +5,69 @@

 uname=$(uname)

-#export PATH="$PATH:/c/Program Files/Java/jdk-17.0.3/bin/"
-#export JAVA_HOME="/c/Program Files/Java/jdk-17.0.3"
-# to use it for Oracle OpenJDK18
+# Third-party builders should always override this in config_override.sh
+if [ -z "$SIGNER" ]; then
+    SIGNER=hankhill19580@gmail.com
+    export SIGNER=hankhill19580@gmail.com
+fi
+
+if [ -z "$I2P_LIBS" ]; then
+    if [ -d "$HOME/i2p/lib/" ]; then
+        I2P_LIBS="$HOME/i2p/lib/"
+    fi
+    if [ -d "$LOCALAPPDATA/i2p/lib/" ]; then
+        I2P_LIBS="$LOCALAPPDATA/i2p/lib/"
+    fi
+    if [ -d "/usr/share/i2p/lib/" ]; then
+        I2P_LIBS="/usr/share/i2p/lib/"
+    fi
+fi
+
+if [ -z "$I2P_SNARK_DIR" ]; then
+    if [ -d "$HOME/.i2p/i2psnark" ]; then
+        I2P_SNARK_DIR="$HOME/.i2p/i2psnark"
+    fi
+    if [ -d "$LOCALAPPDATA/i2p/i2psnark/" ]; then
+        I2P_SNARK_DIR="$LOCALAPPDATA/i2p/i2psnark/"
+    fi
+    if [ -d "/var/lib/i2p/i2p-config/i2psnark/" ]; then
+        I2P_SNARK_DIR="/var/lib/i2p/i2p-config/i2psnark/"
+    fi
+fi
+
+NSIS_PATH="/c/Program Files (x86)/NSIS/Bin"
+PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
+export PATH="$NSIS_PATH:$PATH:$NSIS_PATH/"
+
+wget_download(){
+    which powershell && powershell Invoke-WebRequest $@ && return
+    wget $@
+}
+
+makensisi(){
+    which makensis && makensis $@ && return
+    which wsl && wsl makensis $@ && return
+}
+
+make_make(){
+    which make && make $@ && return
+    which wsl && wsl make $@ && return
+}

 if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
-    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"
+    JAVA_HOME=$(java -XshowSettings:properties -version 2>&1 | findstr "java.home" | sed 's|    java.home = ||g')
+    export JAVA_HOME="$JAVA_HOME"
+    PATH="$JAVA_HOME/bin/:$PATH:$JAVA_HOME/bin/"
+    export PATH="$JAVA_HOME/bin/:$PATH:$JAVA_HOME/bin/"
    HOST=win32
    export HOST=win32
 fi

 if [ "${uname}" != "Linux" ]; then
-    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"
+    JAVA_HOME=$(java -XshowSettings:properties -version 2>&1 | findstr "java.home" | sed 's|    java.home = ||g')
+    export JAVA_HOME="$JAVA_HOME"
+    PATH="$JAVA_HOME/bin/:$PATH:$JAVA_HOME/bin/"
+    export PATH="$JAVA_HOME/bin/:$PATH:$JAVA_HOME/bin/"
    HOST=win32
    export HOST=win32
 fi
@ -32,10 +77,10 @@ fi
 ## This isn't a default install location, obviously, it's where I unzipped it.
 ## It won't work for you unless you kurtly tell Windows that your name is `user`
 ## every time you make an account, like I do.
-#PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
-#export PATH="/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/:$PATH:/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19/bin/"
-#JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
-#export JAVA_HOME=/c/Users/user/Downloads/openjdk-19_windows-x64_bin/jdk-19
+#PATH="/c/Users/user/Downloads/openjdk-20_windows-x64_bin/jdk-20/bin/:$PATH:/c/Users/user/Downloads/openjdk-20_windows-x64_bin/jdk-20/bin/"
+#export PATH="/c/Users/user/Downloads/openjdk-20_windows-x64_bin/jdk-20/bin/:$PATH:/c/Users/user/Downloads/openjdk-20_windows-x64_bin/jdk-20/bin/"
+#JAVA_HOME=/c/Users/user/Downloads/openjdk-20_windows-x64_bin/jdk-20
+#export JAVA_HOME=/c/Users/user/Downloads/openjdk-20_windows-x64_bin/jdk-20

 ## Other potential values(NOT exhaustive):

@ -72,8 +117,17 @@ fi
 # You can also use this to temporarily add applications into the PATH that are
 # required to build this if you do not wish to edit your PATH across the entire
 # Windows session, and for setting ANT_HOME
-#export ANT_HOME="/c/apache-ant-1.10.9"
-#export PATH="$PATH:$ANT_HOME/bin/"
+if [ -d "/c/apache-ant-"* ]; then
+    ANT_HOME=$(ls -d /c/apache-ant-*)
+    export ANT_HOME="$ANT_HOME"
+    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/"
--- a/6
+++ b/6
@ -7,9 +7,9 @@ export I2PFIREFOX_VERSION=1.0.9
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
 VERSIONMAJOR=2
-VERSIONMINOR=2
+VERSIONMINOR=4
 VERSIONBUILD=0
 I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
-VERSION=i2p-2.2.0
-export VERSION=i2p-2.2.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/makefiles/su-unsigned.mk
+++ b/makefiles/su-unsigned.mk
@ -1,35 +0,0 @@
-
-prepupdate-unsignedexe:
-	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION).su3" i2pwinupdate-unsignedexe.su3
-
-su3-unsignedexe: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
-	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
-	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION).exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER)
-
-i2pwinupdate-unsignedexe.su3.torrent: prepupdate-unsignedexe su3-unsignedexe
-	mktorrent \
-		--announce=http://tracker2.postman.i2p/announce.php \
-		--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
-		--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
-		i2pwinupdate-unsignedexe.su3
-
-torrent-unsignedexe: i2pwinupdate-unsignedexe.su3.torrent
-
-testing-releases.json: torrent-unsignedexe
-	mkdir -p ../i2p.newsxml/data/win/testing/
-	@echo "["		| tee ../i2p.newsxml/data/win/testing/releases.json
-	@echo "  {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "    \"date\": \"$(I2P_DATE)\","			| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "    \"version\": \"$(I2P_VERSION)\","	| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "    \"minVersion\": \"1.5.0\","			| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "    \"minJavaVersion\": \"1.8\","		| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "    \"updates\": {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "      \"su3\": {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "        \"torrent\": \"$(MAGNET_TESTING)\","		| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "        \"url\": ["		| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""	| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "        ]"	| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "      }"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "    }"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "  }"			| tee -a ../i2p.newsxml/data/win/testing/releases.json
-	@echo "]"			| tee -a ../i2p.newsxml/data/win/testing/releases.json
--- a/makefiles/su.mk
+++ b/makefiles/su.mk
@ -1,41 +0,0 @@
-GOPATH=$(HOME)/go
-
-$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
-	git clone https://i2pgit.org/idk/su3-tools $(GOPATH)/src/i2pgit.org/idk/su3-tools; true
-	git pull --all
-	cd $(GOPATH)/src/i2pgit.org/idk/su3-tools && \
-		go mod vendor && go build
-
-prepupdate:
-	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-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 \
-		--announce=http://tracker2.postman.i2p/announce.php \
-		--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
-		--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
-		i2pwinupdate.su3
-
-torrent: i2pwinupdate.su3.torrent
-
-releases.json:
-	@echo "["		| tee ../i2p.newsxml/data/win/beta/releases.json
-	@echo "  {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"date\": \"$(I2P_DATE)\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"version\": \"$(PROFILE_VERSION)\","	| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"minVersion\": \"1.5.0\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"minJavaVersion\": \"1.8\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"updates\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "      \"su3\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "        \"torrent\": \"$(MAGNET)\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "        \"url\": ["		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""	| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "        ]"	| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "      }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "  }"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "]"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/src/nsis/i2pbrowser-installer.nsi
@ -10,7 +10,6 @@ UniCode true
 !define CONSOLE_URL "http://127.0.0.1:7657/home"

 !include i2pbrowser-version.nsi
-!include i2pbrowser-jpackage.nsi
 !include FindProcess.nsh

 #var INSTDIR
@ -152,8 +151,8 @@ Function routerDetect

    createDirectory "$INSTDIR\"
    SetOutPath "$INSTDIR\"
-    File  /a /r "I2P/config/certificates"
-    File  /a /r "I2P/config/geoip"
+    File  /a /r "I2P\config\certificates\"
+    File  /a /r "I2P\config\geoip\"
 FunctionEnd

 Function installerFunction
@ -178,7 +177,7 @@ Function installerFunction
    # Install the licenses
    createDirectory "$INSTDIR\licenses"
    SetOutPath "$INSTDIR\licenses"
-    File /a /r "licenses/*"
+    File /a /r "licenses\"

    SetOutPath "$INSTDIR"
    createDirectory "$SMPROGRAMS\${APPNAME}"
@ -275,21 +274,9 @@ Function LaunchLink
  ${If} ${Silent}
    ReadEnvStr $0 RESTART_I2P
    ${If} $0 != ""
-        UserInfo::GetAccountType
-        pop $0
-        ${If} $0 == "admin"
-            ShellExecAsUser::ShellExecAsUser "open" "$DESKTOP\Browse I2P.lnk"
-        ${Else}
           ExecShell "" "$DESKTOP\Browse I2P.lnk"
-        ${EndIf}
    ${EndIf}  
  ${Else}
-    UserInfo::GetAccountType
-    pop $0
-    ${If} $0 == "admin"
-        ShellExecAsUser::ShellExecAsUser "open" "$DESKTOP\Browse I2P.lnk"
-    ${Else}
        ExecShell "" "$DESKTOP\Browse I2P.lnk"
-    ${EndIf}
  ${EndIf}
 FunctionEnd
--- a/src/nsis/i2pbrowser-jpackage.nsi
+++ b/src/nsis/i2pbrowser-jpackage.nsi
@ -1 +0,0 @@
-!define I2P_VERSION 
--- a/src/nsis/i2pbrowser-version.nsi
+++ b/src/nsis/i2pbrowser-version.nsi
@ -1,3 +1,3 @@
 !define VERSIONMAJOR 2
-!define VERSIONMINOR 2
+!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	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
eyedeekay	0566665a24	update version numbers	2023-07-10 15:03:20 -04:00
eyedeekay	9d8da8b65a	update version numbers	2023-07-10 15:02:54 -04:00
idk	cbf693dfb3	move more stuff out of makefiles and into scripts	2023-04-30 05:50:03 +00:00
idk	2b24239267	add torrent releaser script	2023-04-30 05:20:28 +00:00
idk	706ae974bc	add download-back buildscript	2023-04-30 05:05:46 +00:00
idk	d7544ced5f	Remove redundant clean	2023-04-28 20:36:36 +00:00
idk	ec44c0f6e3	remove redundant clean	2023-04-28 20:35:34 +00:00
idk	10fe05066c	use powershell before which wget in wget finder function	2023-04-24 16:28:29 +00:00
idk	a5c7bac581	zip in release upload	2023-04-22 15:33:40 +00:00
idk	7eeb2e4523	add release uploader script	2023-04-22 06:14:05 +00:00
idk	9cae0f78ad	add release uploader script	2023-04-22 06:06:11 +00:00
idk	99438cfc33	fix changelog date	2023-04-22 06:00:58 +00:00
idk	eba4ebe3d0	remove last few references to wsl	2023-04-22 05:50:24 +00:00
idk	7f24838725	ShellExecAsUser is not required for installers that do not run as admin, this installer is adminless	2023-04-19 03:30:06 +00:00
idk	673725304c	ShellExecAsUser is not required for installers that do not run as admin, this installer is adminless	2023-04-19 02:13:43 +00:00
idk	7cf2bf455a	fix licenses path on windows	2023-04-19 02:05:22 +00:00
idk	d177435b50	work around makensis path issues	2023-04-19 01:34:29 +00:00
idk	33fb6ab6d5	work around makensis path issues	2023-04-19 01:33:05 +00:00
idk	29827366fb	work around makensis path issues	2023-04-19 01:30:01 +00:00
idk	edfe44bc3b	work around makensis path issues	2023-04-19 01:26:11 +00:00
idk	432e2c54f8	bump version	2023-04-19 01:25:02 +00:00
idk	8894c946bc	work around makensis path issues	2023-04-19 01:16:51 +00:00
idk	bc9b4a0250	use invoke-webrequest instead of wget on windows	2023-04-19 00:01:20 +00:00
idk	35841c7887	fix positional args for wsl-free build	2023-04-18 23:14:09 +00:00
idk	e3afb9de1d	fix paths for wsl-free windows build	2023-04-18 23:03:48 +00:00
idk	3b11def66c	fix paths for wsl-free windows build	2023-04-18 22:54:12 +00:00
idk	e152513043	Work around absence of wget, lessens requirement of wsl	2023-04-18 22:35:26 +00:00
idk	81dd3ed5ef	update config file, automatically determine JAVA_HOME from java in path, automatically find apache ant	2023-04-18 20:28:41 +00:00
idk	0630f77a4c	update .gitignore	2023-04-18 20:16:34 +00:00
idk	204fda1a11	Remove i2pbrowser-jpackage file	2023-04-18 20:14:33 +00:00
idk	9e1ef2d546	Remove i2pbrowser-jpackage file	2023-04-18 20:14:25 +00:00
idk	688bc1b0f3	update from 2.2.0 to 2.2.1	2023-04-18 20:10:10 +00:00
idk	dd566165dd	update from -19 to -20	2023-04-18 20:07:41 +00:00