fix URL

.gitattributes

@@ -0,0 +1 @@
+* -text

.github/workflows/ant-latest.yml

@@ -0,0 +1,135 @@
+
+name: Java 22 CI
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  schedule:
+    - cron: '0 0 * * *' # Every day at midnight UTC
+  workflow_dispatch:
+
+jobs:
+
+  nsis-jdk22:
+    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 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/unsigned.sh; ls *.exe"
+      - name: Upload archived copy of I2P router source embedded in the build
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p.i2p.jpackage-build.tar.gz
+          path: i2p.i2p.jpackage-build.tar.gz
+      - name: Upload prebuilt jpackage bundle without any plugins or modded config
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-Prebuilt.zip
+          path: I2P-Prebuilt.zip
+      - name: Upload I2P-Easy-Install-Bundle-unsigned.exe
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-Easy-Install-Bundle-unsigned-jdk22.exe
+          path: I2P-Easy-Install-Bundle-*.exe
+
+  buildjpackagexe-jdk22:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          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-jdk22.exe
+          path: I2P-EXE-*.exe
+
+  buildjpackagmsi-jdk22:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          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-jdk22.msi
+          path: I2P-MSI-*.msi
+
+  buildzip-jdk22:
+    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-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 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/zip.sh; ls -d * */* "
+      - name: Upload I2P-windows-portable.zip
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-windows-portable-jdk22.zip
+          path: I2P-windows-portable.zip
+        
+  buildtgz-jdk22:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK 22
+        uses: actions/setup-java@v4
+        with:
+          java-version: '22'
+          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-jdk22.tar.gz
+          path: I2P.tar.gz

.github/workflows/ant.yml

@@ -0,0 +1,135 @@
+
+name: Java CI
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  schedule:
+    - cron: '0 0 * * *' # Every day at midnight UTC
+  workflow_dispatch:
+
+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 archived copy of I2P router source embedded in the build
+        uses: actions/upload-artifact@v4
+        with:
+          name: i2p.i2p.jpackage-build.tar.gz
+          path: i2p.i2p.jpackage-build.tar.gz
+      - name: Upload prebuilt jpackage bundle without any plugins or modded config
+        uses: actions/upload-artifact@v4
+        with:
+          name: I2P-Prebuilt.zip
+          path: I2P-Prebuilt.zip
+      - 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-*.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-*.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-*.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-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
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - name: build with script
+        run: bash -c "./buildscripts/zip.sh; ls -d * */* "
+      - 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

.github/workflows/release-nightly-latest.yml

@@ -0,0 +1,101 @@
+name: Nightly Release
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  schedule:
+    - cron: '0 0 * * *' # Every day at midnight UTC
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            changelog.txt
+            docs/RELEASE.md
+          sparse-checkout-cone-mode: false
+      - name: sleep 22 minutes
+        run: |
+          echo "sleeping 22 minutes to wait for artifacts"
+          sleep 1m
+          echo "sleeping 21 minutes to wait for artifacts"
+          sleep 1m
+          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"
+          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-latest.yml
+          if_no_artifact_found: fail
+      # remove .zip file extension
+      - run: for f in *.zip; do unzip "$f"; rm "$f"; done
+      - run: cp changelog.txt changelog-java22.txt
+      - run: echo "" | tee -a changelog-java22.txt
+      - run: echo "## Checksums" | tee -a changelog-java22.txt
+      - run: echo "" | tee -a changelog-java22.txt
+      - run: echo '```' | tee -a changelog-java22.txt
+      - run: sha256sum * | tee -a changelog-java22.txt
+      - run: echo '```' | tee -a changelog-java22.txt
+      - run: echo "" | tee -a changelog-java22.txt
+      - run: echo '```' | tee -a changelog-java22.txt
+      - run: file * | tee -a changelog-java22.txt
+      - run: echo '```' | tee -a changelog-java22.txt
+      - run: echo "" | tee -a changelog-java22.txt
+      - run: cat docs/RELEASE.md changelog-java22.txt > RELEASE.md
+      - name: Upload artifacts
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "*"
+          prerelease: true
+          allowUpdates: true
+          replacesArtifacts: true
+          makeLatest: true
+          tag: nightly
+          bodyFile: "RELEASE.md"

.github/workflows/release-nightly.yml

@@ -0,0 +1,96 @@
+name: Nightly 22 Release
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  schedule:
+    - cron: '0 0 * * *' # Every day at midnight UTC
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            changelog.txt
+            docs/RELEASE.md
+          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"
+          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
+      - run: cat docs/RELEASE.md changelog.txt > RELEASE.md
+      - name: Upload artifacts
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "*"
+          prerelease: true
+          allowUpdates: true
+          replacesArtifacts: true
+          makeLatest: true
+          tag: nightly
+          bodyFile: "RELEASE.md"

.github/workflows/release.yml

@@ -0,0 +1,89 @@
+name: Release
+
+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
+            docs/RELEASE.md
+          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"
+          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
+      - run: cat docs/RELEASE.md changelog.txt > RELEASE.md
+      - name: Upload artifacts
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "*"
+          bodyFile: "RELEASE.md"

.github/workflows/sync.yaml

@@ -0,0 +1,66 @@
+# GitHub Actions workflow file to sync an external repository to this GitHub mirror.
+# This file was automatically generated by go-github-sync.
+#
+# The workflow does the following:
+# - Runs on a scheduled basis (and can also be triggered manually)
+# - Clones the GitHub mirror repository
+# - Fetches changes from the primary external repository
+# - Applies those changes to the mirror repository
+# - Pushes the updated content back to the GitHub mirror
+#
+# Authentication is handled by the GITHUB_TOKEN secret provided by GitHub Actions.
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Validate Github Actions Environment
+        run: if [ "$GITHUB_ACTIONS" != "true" ]; then echo 'This script must be run in a GitHub Actions environment.'; exit 1; fi
+      - name: Checkout GitHub Mirror
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Configure Git
+        run: |-
+          git config user.name 'GitHub Actions'
+          git config user.email 'actions@github.com'
+      - env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        name: Sync Primary Repository
+        run: |-
+          # Add the primary repository as a remote
+          git remote add primary https://i2pgit.org/I2P_Developers/i2p.firefox.git
+
+          # Fetch the latest changes from the primary repository
+          git fetch primary
+
+          # Check if the primary branch exists in the primary repository
+          if git ls-remote --heads primary master | grep -q master; then
+            echo "Primary branch master found in primary repository"
+          else
+            echo "Error: Primary branch master not found in primary repository"
+            exit 1
+          fi
+
+          # Check if we're already on the mirror branch
+          if git rev-parse --verify --quiet master; then
+            git checkout master
+          else
+            # Create the mirror branch if it doesn't exist
+            git checkout -b master
+          fi
+
+
+          # Force-apply all changes from primary, overriding any conflicts
+          echo "Performing force sync from primary/master to master"
+          git reset --hard primary/master
+
+
+          # Push changes back to the mirror repository
+          git push origin master
+name: Sync Primary Repository to GitHub Mirror
+"on":
+  push: {}
+  schedule:
+    - cron: 0 * * * *
+  workflow_dispatch: {}

.gitignore

@@ -18,4 +18,14 @@ i2pversion_override
 *.log
 cmd
 *.so
-*.jar
+*.jar
+*.zip
+*.tar.gz
+config_override.sh
+i2pkeys
+onionkeys
+tlskeys
+tmp
+/.stfolder/
+/.vscode/
+*github-release-config*.sh*

Dockerfile

@@ -1,10 +1,46 @@
-FROM alpine:latest
-RUN apk update && apk add firefox make curl musl-locales dbus-x11 font-ubuntu-nerd jq --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing
-ADD . /src
-WORKDIR /src
-RUN make profile.tgz # && \
-RUN chown -R 1000:1000 /src/build/profile # && \
-RUN chmod -R +w /src/build/profile
-RUN ls -lah /src/build/profile
-#USER 1000
-CMD sh -c 'cd build/profile && ./i2pbrowser.sh'
+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

LICENSE.html

@@ -8,68 +8,113 @@
     <meta name="keywords" content="master" />
     <link rel="stylesheet" type="text/css" href="style.css" />
     <link rel="stylesheet" type="text/css" href="showhider.css" />
+    <link rel="stylesheet" type="text/css" href="darklight.css" />
   </head>
   <body>
-    <div id="navbar">
-      <a href="#shownav">
-        Show navigation
-      </a>
-      <div id="shownav">
-        <div id="hidenav">
-          <ul>
-            <li>
-              <a href="index.html">
-                index
-              </a>
-            </li>
-            <li>
-              <a href="LICENSE.html">
-                LICENSE
-              </a>
-            </li>
-            <li>
-              <a href="UPDATES.html">
-                UPDATES
-              </a>
-            </li>
-          </ul>
-          <br>
-          <a href="#hidenav">
-            Hide Navigation
-          </a>
+    <input type="checkbox" id="checkboxDarkLight">
+    <div class="container">
+      <div id="navbar">
+        <a href="#shownav">
+          Show navigation
+        </a>
+        <div id="shownav">
+          <div id="hidenav">
+            <ul>
+              <li>
+                <a href="..">
+                  Up one level ^
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index
+                </a>
+              </li>
+              <li>
+                <a href="LICENSE.html">
+                  LICENSE
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index.html
+                </a>
+              </li>
+              <li>
+                <a href="docs/GOALS.html">
+                  docs/GOALS
+                </a>
+              </li>
+              <li>
+                <a href="docs/PRINCIPLES.html">
+                  docs/PRINCIPLES
+                </a>
+              </li>
+              <li>
+                <a href="docs/RELEASE.html">
+                  docs/RELEASE
+                </a>
+              </li>
+              <li>
+                <a href="docs/UPDATES.html">
+                  docs/UPDATES
+                </a>
+              </li>
+            </ul>
+            <br>
+            <a href="#hidenav">
+              Hide Navigation
+            </a>
+          </div>
         </div>
       </div>
-    </div>
-    <p>
-      Copyright 2018
-    </p>
-    <p>
-      Permission is hereby granted, free of charge, to any person obtaining a copy of
-      this software and associated documentation files (the “Software”), to deal in
-      the Software without restriction, including without limitation the rights to
-      use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-      the Software, and to permit persons to whom the Software is furnished to do so,
-      subject to the following conditions:
-    </p>
-    <p>
-      The above copyright notice and this permission notice shall be included in all
-      copies or substantial portions of the Software.
-    </p>
-    <p>
-      THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-      IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-      FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-      COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-      IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-      CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-    </p>
-    <div>
-      <a href="#show">
-        Show license
+      <a id="returnhome" href="/">
+        /
       </a>
-      <div id="show">
-        <div id="hide">
-          <pre><code>Copyright 2018
+      <p>
+        Copyright 2018
+      </p>
+      <p>
+        Permission is hereby granted, free of charge, to any person obtaining a copy of
+        this software and associated documentation files (the &ldquo;Software&rdquo;), to deal in
+        the Software without restriction, including without limitation the rights to
+        use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+        the Software, and to permit persons to whom the Software is furnished to do so,
+        subject to the following conditions:
+      </p>
+      <p>
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+      </p>
+      <p>
+        THE SOFTWARE IS PROVIDED &ldquo;AS IS&rdquo;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+        FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+        COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+        IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+        CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+      </p>
+      <div id="sourcecode">
+        <span id="sourcehead">
+          <strong>
+            Get the source code:
+          </strong>
+        </span>
+        <ul>
+          <li>
+            <a href="https://github.com/eyedeekay/i2p.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.firefox)
+            </a>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <a href="#show">
+          Show license
+        </a>
+        <div id="show">
+          <div id="hide">
+            <pre><code>Copyright 2018
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -88,9 +133,10 @@ COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 </code></pre>
-          <a href="#hide">
-            Hide license
-          </a>
+            <a href="#hide">
+              Hide license
+            </a>
+          </div>
         </div>
       </div>
     </div>
@@ -99,7 +145,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     </div>
     <div>
       <a href="https://geti2p.net/">
-        <img src="i2plogo.png"></img>
+        <img class="i2plogo" src="i2plogo.png"></img>
         I2P
       </a>
     </div>

Makefile

@@ -7,98 +7,37 @@ preset=`rm .version; make version`
 
 -include .version
 
-PROFILE_VERSION=$(MAJOR).$(MINOR).$(BUILD)
+PROFILE_VERSION=$(VERSIONMAJOR).$(VERSIONMINOR).$(VERSIONBUILD)
 
-all: version prep install.exe
+all: version install.exe
 
-tag:
-	git tag $(PROFILE_VERSION)
+fmt:
+	find . -name '*.java' -exec clang-format -i {} \;
 
 version:
-	echo !define VERSIONMAJOR $(VERSIONMAJOR) > src/nsis/i2pbrowser-version.nsi
-	echo !define VERSIONMINOR $(VERSIONMINOR) >> src/nsis/i2pbrowser-version.nsi
-	echo !define VERSIONBUILD $(VERSIONBUILD) >> src/nsis/i2pbrowser-version.nsi
-	sed 's|!define VERSION||g' src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version
-	rm -f version.txt
-	make version.txt i2pbrowser-jpackage.nsi
+	./buildscripts/version.sh
 
-version.txt:
-	echo "$(PROFILE_VERSION)" > src/profile/version.txt
-	echo "$(PROFILE_VERSION)" > src/app-profile/version.txt
-
-i2pbrowser-jpackage.nsi:
-	echo "!define I2P_VERSION $(PROFILE_VERSION)" > src/nsis/i2pbrowser-jpackage.nsi
-
-jpackage: version I2P build/I2P/config all
+jpackage: version I2P build/I2P all
 
 help: version
-	@echo "I2P-Profile-Installer-$(PROFILE_VERSION)"
-	@echo "$(SIGNER)"
+	@echo "I2P-Easy-Install-Bundle-$(PROFILE_VERSION)"
 	@echo "$(I2P_VERSION)"
 	@echo "$(MAJOR).$(MINOR).$(BUILD)"
 	@echo "$(preset)"
 
-prep: #launchers build/licenses profile.tgz app-profile.tgz profile build/I2P build/I2P/config #
-	make launchers
-	echo "launchers" >make.log
-	make build/licenses
-	echo "licenses" >make.log
-	make profile.tgz
-	echo "profilezip" >make.log
-	make app-profile.tgz
-	echo "appprofile" >make.log
-	make profile 
-	echo "profile" >make.log
-	make build/I2P
-	echo "buildi2p" >make.log
-	make build/I2P/config
-	echo "buildi2pconfig" >make.log
-	cp src/nsis/*.nsi build
-	echo "nsi1" >make.log
-	cp src/nsis/*.nsh build
-	echo "nsi2" >make.log
-	cp src/icons/*.ico build
+install.exe:
+	./buildscripts/unsigned.sh
 
-install.exe: #build/licenses
-	cd build && makensis i2pbrowser-installer.nsi && cp I2P-Profile-Installer-*.exe ../ && echo "built windows installer"
-
-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"
-
-distclean: clean clean-extensions
+distclean: clean
 	rm -rf I2P
-	git clean -fd
 
 I2P:
-	./build.sh
+	./buildscripts/build.sh
 
 build/I2P: I2P build
-	rm -rf build/I2P
-	cp -rv I2P build/I2P ; true
-	cp "$(I2P_JBIGI)"/*windows*.dll build/I2P/runtime/lib; true
+	cp -v I2P build/I2P
 
-src/I2P/config:
-	mkdir -p src/I2P/config
-	rm -rf src/I2P/config/geoip src/I2P/config/webapps src/I2P/config/certificates
-	echo true | tee src/I2P/config/jpackaged
-	cp -v $(RES_DIR)/clients.config src/I2P/config/
-	cp -v $(RES_DIR)/wrapper.config src/I2P/config/
-	#grep -v 'router.updateURL' $(RES_DIR)/router.config > src/I2P/config/router.config
-	cat router.config > src/I2P/config/router.config
-	cat i2ptunnel.config > src/I2P/config/i2ptunnel.config
-	cp -v $(RES_DIR)/hosts.txt src/I2P/config/hosts.txt
-	cp -R $(RES_DIR)/certificates src/I2P/config/certificates
-	cp -R $(RES_DIR)/eepsite src/I2P/config/eepsite
-	mkdir -p src/I2P/config/geoip
-	cp -v $(RES_DIR)/GeoLite2-Country.mmdb.gz src/I2P/config/geoip/GeoLite2-Country.mmdb.gz
-	cp -R "$(PKG_DIR)"/webapps src/I2P/config/webapps
-	cd src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../..
-
-build/I2P/config: src/I2P/config build/I2P
-	cp -rv src/I2P/config build/I2P/config
-#	cp -rv build/I2P/* I2P/
-#	cp -rv src/I2P/config build/I2P/.i2p
+build/I2P: build/I2P
 
 #
 # Warning: a displayed license file of more than 28752 bytes
@@ -106,74 +45,12 @@ build/I2P/config: src/I2P/config build/I2P
 # Possibly related: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=895064
 #
 build/licenses: build
-	mkdir -p build/licenses
-	cp license/* build/licenses
-	cp LICENSE.md build/licenses/MIT.txt
-	cat build/licenses/LICENSE.index \
-		build/licenses/EPL.txt \
-		build/licenses/GPL+CLASSPATH.txt \
-		build/licenses/HTTPS-Everywhere.txt \
-		build/licenses/LICENSE.tor \
-		build/licenses/MIT.txt \
-		build/licenses/MPL2.txt \
-		build/licenses/NoScript.txt \
-		build/licenses/NSS.txt \
-		build/licenses/I2P.txt > build/licenses/LICENSE.txt
-	unix2dos build/licenses/LICENSE.txt
+	./buildscripts/licenses.sh
 
 clean:
-	rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb src/I2P/config *.su3 .version *.url make.log
-	git clean -fdx src build
+	./buildscripts/clean.sh
 
 build:
 	@echo "creating build directory"
 	mkdir -p build
 
-include makefiles/profile.mk
-
-include makefiles/app-profile.mk
-
--include makefiles/new-extensions.mk
-
-include makefiles/extensions.mk
-
-include makefiles/build.mk
-
-include makefiles/install.mk
-
-include makefiles/su.mk
-
-include makefiles/su-unsigned.mk
-
-include makefiles/docker.mk
-
-include makefiles/debian.mk
-
-I2P_DATE=`date +%Y-%m-%d`
-
-MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
-MAGNET_TESTING=`bttools torrent printinfo i2pwinupdate-testing.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
-
-BLANK=`awk '! NF { print NR; exit }' changelog.txt`
-
-I2P.zip: I2P-jpackage-windows-$(I2P_VERSION).zip
-
-I2P-jpackage-windows-$(I2P_VERSION).zip:
-	zip I2P-jpackage-windows-$(I2P_VERSION).zip -r build/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

README.md

@@ -1,19 +1,27 @@
-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:
 ---------
 
-- Automatically select an up-to-date, secure Firefox or Tor Browser(On Windows) variant
+- Automatically select an up-to-date, secure browser from the host platform, with Tor Browser and Firefox preferred.
 - Automatically configure a profile for I2P
 - Automatically block-list all non-I2P local destinations
-- Enable first-party isolation, anti-fingerprinting, letterboxing
+- Enable first-party isolation, anti-fingerprinting, letterboxing, fusion, other privacy and security options
 - Automatically sandbox I2P, Non-I2P, and I2P-Application cookiestores
 
 Build Dependencies:
 -------------------
 
-To build this, you will need the following software packages (all available in Debian) :
+**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):
 
 - make
 - nsis
@@ -21,6 +29,16 @@ To build this, you will need the following software packages (all available in D
 - curl
 - jq
 
+These need to be installed in the environment where the NSIS
+Package is build, NOT the environment where the java package
+is built. These may be different, because you will need to
+use a system which provides a Unix-like environment on top of
+a Windows system. You can use WSL or Cygwin, and more detailed
+instructions are provided below.
+
+Building for Windows target from Linux is not possible unless
+you obtain a Windows package from my github.
+
 In addition, you will need the NSIS plugin "ShellExecAsUser" which you can get from the
 [NSIS Wiki Page](https://nsis.sourceforge.io/ShellExecAsUser_plug-in). In order to install
 the plugin on Debian, Ubuntu, or using `WSL`, you can download the: [7zip release](https://nsis.sourceforge.io/mediawiki/images/6/68/ShellExecAsUser_amd64-Unicode.7z)
@@ -30,89 +48,28 @@ and copy the content of `Plugins` to `/usr/share/nsis/Plugins`.
 cp -rv Plugins/* /usr/share/nsis/Plugins/
 ```
 
-To build a Debian package, you'll also need
-
-- checkinstall
-
-Preparation
------------
-
-Before you build, run the targets
-
-        make clean-extensions
-        make extensions
-
-to update the extensions to point to their latest versions.
-
-Windows Build
--------------
-
-After installing the dependencies and completing the preparations,
-just run `make`.  This will produce three files:
-
-profile.tgz - the firefox profile, plus a shell script which will
-launch it if Firefox is found in the $PATH on Unix-Like operating
-systems.
-app-profile.tgz - the Firefox profile plus a launcher shell script,
-which will launch a *modified* Firefox without a URL bar as a router
-console wrapper.
-install.exe - the windows installer, which sets up shortcuts to
-launch Firefox on Windows.
-
-When generating a Windows build it's important to make sure that the
-licenses for all the bundled softare are included. This should happen
-automatically. When bundling software, describe the terms and where
-they are applied in the `LICENSE.index`, then add the full license
-to the `licenses` directory. Then, add the full license to the `cat`
-command in the `build/licenses` make target. The build/licenses
-target is run automatically during the build process.
-
-Unix Support
-------------
-
-It is possible to use these profiles on Linux and possibly other
-Unixes, if Firefox is already installed on the system. It can be
-installed system-wide using the `make install` target. Running
-`make install` requires root, and requires `make` to have been run
-first. To install on Unix, system-wide, run:
-
-        make
-        sudo make install
-
-To run without installing them system wide, unpack the `profile*.tgz`
-to a location of your choice and run the `i2pbrowser.sh` script. This
-will start a Firefox profile configured to use I2P.
-
-        tar xvf profile-0.3.tgz
-        cd profile
-        ./i2pbrowser.sh
-
-If you want to run the app-like i2pconfig browser, then follow the
-same steps with app-profile*.tgz.
-
-        tar xvf app-profile-0.3.tgz
-        cd app-profile
-        ./i2pconfig.sh
-
-To generate a `deb` package, install the package `checkinstall` and run
-the `make checkinstall` target after building with `make`.
-
-        make
-        make checkinstall
-        sudo apt install ./i2p-firefox*.deb
-
-If you want to set up i2pconfig to run when you start the service
-with `sudo service i2p start` then you can run the script:
-
-        /usr/local/bin/i2p-config-service-setup
-
 Including a jpackaged I2P Router
 --------------------------------
 
+**Prerequisites:** You need to have OpenJDK 14 or greater installed and configured
+with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on
+your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%`
+environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have
+Cygwin installed. You must have `NSIS.exe` installed and `makensis` available on your
+`%PATH%`. You must have Git for Windows installed. When installing git for Windows,
+you should select "Checkout as is, commit as is" and leave line-endings alone.
+
+The Windows build tools listed above must be installed on the Windows host machine.
+
+TODO: Add links to the respective instructions for each of these.
+
+**Note that after the dependencies are installed, this step is automated**
+**with `./buildscripts/build.sh`.**
+
 In order to include a jpackaged(dependency-free) I2P router in the Profile
 Bundle you will need to build the jpackaged I2P router as an "App Image" on
 a Windows system and place it into a directory called `I2P` in your `i2p.firefox`
-checkout.
+checkout. Building without a jpackage is no longer supported.
 
 Assuming a working java and jpackage environment on your Windows system, the
 following command should generate a suitable "App Image" in a directory
@@ -130,27 +87,41 @@ necessary, then complete the regular build instructions. If a jpackaged I2P rout
 isn't present to use at build time, the inclusion will be skipped automatically
 with a non-fatal warning.
 
-In the near future, I'll start providing a pre-built app image to ease the
-build process for non-Windows users.
+Pre-built app-images are available from my daily releases at:
 
-End-to-End Windows build process using WSL
-------------------------------------------
+        https://github.com/eyedeekay/i2p.plugins.firefox/releases/
 
-**If you've already done this once, you can just use:** `./build.sh && wsl make`
-**in `git bash`** to automatically build an installer.
+Windows Build
+-------------
 
-**Prerequisites:** You need to have OpenJDK 14 or greater installed and configured
-with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on
-your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%`
-environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have
-Cygwin installed. You must have `NSIS.exe` installed and `makensis` available on your
-`%PATH%`. You must have Git for Windows installed. When installing git for Windows,
-you should select "Checkout as is, commit as is" and leave line-endings alone.
+After installing the dependencies and completing the preparations,
+just run `buildscripts/unsigned.sh`.  This will produce the install.exe - the
+windows installer, which sets up the shortcuts to launch Firefox on Windows.
+Building without a jpackage is no longer supported.
+
+When generating a build it's important to make sure that the
+licenses for all the bundled softare are included. This should happen
+automatically. When bundling software, describe the terms and where
+they are applied in the `LICENSE.index`, then add the full license
+to the `licenses` directory. Then, add the full license to the `cat`
+command in the `build/licenses` make target. The build/licenses
+target is run automatically during the build process.
+
+End-to-End Windows build process using WSL(**Recommended**)
+-----------------------------------------------------------
+
+**See `config.sh` and `i2pversion` for instructions on how to tweak**
+**the build process. File an issue if you need help.**
+
+**If you've already done this once, you can just use:** `./unsigned.sh`
+**in `git bash`** to automatically build an installer. If you
+are using this method, you may use the `makensis` and `make` from
+Ubuntu in WSL.
 
  1. [Set up Windows Subsystem for Linux per Microsoft's instructions](https://docs.microsoft.com/en-us/windows/wsl/install-win10#manual-installation-steps)
  2. [Install Ubuntu Focal per Microsoft's instructions](https://www.microsoft.com/store/apps/9n6svws3rx71)
  3. Open Git Bash.
- 4. Install prerequisites `wsl sudo apt-get update && sudo apt-get install make nsis dos2unix curl jq`
+ 4. Install prerequisites `wsl sudo apt-get update && sudo apt-get install make nsis nsis-pluginapi dos2unix curl jq`
  5. Clone `i2p.i2p` and `i2p.firefox`
 
         git clone https://github.com/i2p/i2p.i2p
@@ -163,30 +134,25 @@ you should select "Checkout as is, commit as is" and leave line-endings alone.
         ant clean pkg
         cd ..
 
- 7. Move into the i2p.firefox directory. Run the `./build.sh` script.
+ 7. Move into the i2p.firefox directory. Run the `./buildscripts/build.sh` script.
 
         cd i2p.firefox
-        ./build.sh
+        ./buildscripts/unsigned.sh
 
  8. Compile the NSIS installer using WSL.
 
         wsl make
 
-End-to-End Windows build process using Cygwin
----------------------------------------------
+End-to-End Windows build process using Cygwin(More difficult than WSL for now)
+------------------------------------------------------------------------------
 
 I highly recommend you look into the Chocolatey package manager, which makes it much
 easier to configure these tools and keep them up to date.
 
-**Prerequisites:** You need to have OpenJDK 14 or greater installed and configured
-with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on
-your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%`
-environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have
-WSL and git bash installed. You must have `NSIS.exe` installed and `makensis` available on your
-`%PATH%`. You must have Git for Windows installed. When installing git for Windows, you should
-select "Checkout as is, commit as is" and leave line-endings alone.
-
-TODO: Add links to the respective instructions for each of these.
+**Prerequisites:** In addition to the other prerequisites, you will need to to have
+`make` installed with `cygwin`. For our purposes, as long as everything else is
+set up and you're using git bash, that is enough to make the scripts compatible with
+`cygwin`. Cygwin builds without git bash are not likely to work.
 
 1. Run the Cygwin `setup-$arch.exe` for your platform to set up new packages. Select the `make` `jq` `dos2unix` and `curl` packages.
 2. Open a cygwin terminal.
@@ -202,62 +168,23 @@ TODO: Add links to the respective instructions for each of these.
         ant clean pkg
         cd ..
 
-5. Move into the i2p.firefox directory. Run the `./build.sh` script.
+5. Move into the i2p.firefox directory. Run the `./buildscripts/unsigned.sh` script.
 
         cd i2p.firefox
-        ./build.sh
-
-6. Run `make` to build the installer.
+        ./buildscripts/unsigned.sh
 
 Doing a Release
 ---------------
 
 Once you have the installer `.exe` file produced by NSIS, you're almost ready to
 do a release. As a final step, someone must sign the `.exe` file using a
-Certificate which Windows will recognize. The current signer of the Windows
-bundle is Zlatinb. Standard Windows signing tools are used.
+Certificate which Windows will recognize. Standard Windows signing tools are used.
 
 ```sh
-# Release Copypasta
-./clean.sh
-wsl make distclean
-wsl make clean-extensions
-wsl make extensions
-./build.sh
-wsl make
-./sign.sh
+./release.sh
 ```
 
-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
---------------
-
-You can use a Docker container to install this browser profile as well. In order
-to do this, you can run the commands:
-
-        xhost + local:docker
-        docker run -it --rm \
-          --net=host \
-          -e DISPLAY=unix$(DISPLAY) \
-          -v /tmp/.X11-unix:/tmp/.X11-unix \
-          geti2p/i2p.firefox firefox --profile /src/build/profile
-
-To build and run the container locally, clone this repository and run the
-
-        make run
-
-target.
+produces the binary and the su3.
 
 Issues
 ------
@@ -269,11 +196,28 @@ pertaining to the plugins may be reported to their upstream
 maintainers if it's determined that our configuration is not at
 fault.
 
-NoScript is developed on Github by `hackademix` and the community:
- - https://github.com/hackademix/noscript
+## Credits
 
-HTTPS Everywhere is developed on Github by the EFF:
- - https://github.com/EFForg/https-everywhere
+This profile manager makes use of a set of browser extensions which are largely the work of others.
+It makes use of dependencies that are the work of others. In many ways, it's merely an elaborate
+configuration tool. A smart one, but a configuration tool nonetheless. Many thanks to the following
+projects, developers, and communities:
+
+### Firefox and Chrome Extensions
+
+- [NoScript - Giorgio Maone and others](https://noscript.net)
+- [HTTPS Everywhere - Electronic Frontier Foundation](https://www.eff.org/https-everywhere)
+- [uBlock Origin - Raymond Gorhill and others](https://ublockorigin.com/)
+- [LocalCDN - nobody and others](https://www.localcdn.org/)
+- [jShelter - Libor Polčák and others](https://jshelter.org/)
+
+### Firefox Configuration Modifiations
+
+- [Arkenfox - Thorin Oakenpants and Others](https://github.com/arkenfox/user.js/)
+
+You can find the license files for each of the these projects in the `src/i2p.firefox.*.profile/extensions/*`
+directory for Firefox, and the `src/i2p.chromium.*.profile/extensions/*.js/*` directories for Chromium within
+the [`i2p.plugins.firefox`](https://i2pgit.org/idk/i2p.plugins.firefox) project.
 
 I2P in Private Browsing is developed on Gitlab and Github by idk and the community:
  - https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox

UPDATES.html

@@ -1,144 +0,0 @@
-<html>
-  <head>
-    <title>
-      I2P Easy-Install...
-    </title>
-    <meta name="author" content="eyedeekay" />
-    <meta name="description" content="i2p.firefox" />
-    <meta name="keywords" content="master" />
-    <link rel="stylesheet" type="text/css" href="style.css" />
-    <link rel="stylesheet" type="text/css" href="showhider.css" />
-  </head>
-  <body>
-    <div id="navbar">
-      <a href="#shownav">
-        Show navigation
-      </a>
-      <div id="shownav">
-        <div id="hidenav">
-          <ul>
-            <li>
-              <a href="index.html">
-                index
-              </a>
-            </li>
-            <li>
-              <a href="LICENSE.html">
-                LICENSE
-              </a>
-            </li>
-            <li>
-              <a href="UPDATES.html">
-                UPDATES
-              </a>
-            </li>
-          </ul>
-          <br>
-          <a href="#hidenav">
-            Hide Navigation
-          </a>
-        </div>
-      </div>
-    </div>
-    <h1>
-      Setting up an Update Server for an I2P Bundle
-    </h1>
-    <p>
-      It is important to set up a signed update server so that people are able to
-      safely and anonymously update your I2P bundle.
-    </p>
-    <h2>
-      The quick way:
-    </h2>
-    <p>
-      This process depends on my ability to push releases to github. If you are
-      forking, setting up a dev server, or taking over because I got hit by a bus,
-      you’ll need to do it the complete way.
-    </p>
-    <p>
-      For as long as I am building updates, you will be able to mirror the jpackaged
-      Windows bundle by cloning the repository
-      <code>
-        https://github.com/eyedeekay/i2p
-      </code>
-      and
-      running the
-      <code>
-        make docker run
-      </code>
-      target in that repository. You can retrieve the
-      base32 address of your update server by viewing the log with
-      <code>
-        docker logs eephttpd-jpackage | grep b32.i2p | tee eephttpd-address.md
-      </code>
-      . To
-      update the site, run
-      <code>
-        ./update.site.sh
-      </code>
-      in that repository.
-    </p>
-    <p>
-      Once you have cloned the repository and started the container with
-      <code>
-        make docker run
-      </code>
-      , you can simply add
-      <code>
-        path/to/repo/update-site.sh
-      </code>
-      to your
-      <code>
-        crontab
-      </code>
-      and it will update at an interval of your choosing.
-    </p>
-    <h2>
-      The complete way:
-    </h2>
-    <p>
-      TODO: describe how to do it with less of the awesome fancy stuff I put together
-      to make it easier on myself to keep an update server going.
-    </p>
-    <div>
-      <a href="#show">
-        Show license
-      </a>
-      <div id="show">
-        <div id="hide">
-          <pre><code>Copyright 2018
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-</code></pre>
-          <a href="#hide">
-            Hide license
-          </a>
-        </div>
-      </div>
-    </div>
-    <div>
-      <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe>
-    </div>
-    <div>
-      <a href="https://geti2p.net/">
-        <img src="i2plogo.png"></img>
-        I2P
-      </a>
-    </div>
-  </body>
-</html>

UPDATES.md

@@ -1,29 +0,0 @@
-Setting up an Update Server for an I2P Bundle
-=============================================
-
-It is important to set up a signed update server so that people are able to
-safely and anonymously update your I2P bundle.
-
-The quick way:
---------------
-
-This process depends on my ability to push releases to github. If you are
-forking, setting up a dev server, or taking over because I got hit by a bus,
-you'll need to do it the complete way.
-
-For as long as I am building updates, you will be able to mirror the jpackaged
-Windows bundle by cloning the repository `https://github.com/eyedeekay/i2p` and
-running the `make docker run` target in that repository. You can retrieve the
-base32 address of your update server by viewing the log with 
-`docker logs eephttpd-jpackage | grep b32.i2p | tee eephttpd-address.md`. To
-update the site, run `./update.site.sh` in that repository.
-
-Once you have cloned the repository and started the container with
-`make docker run`, you can simply add `path/to/repo/update-site.sh` to your
-`crontab` and it will update at an interval of your choosing.
-
-The complete way:
------------------
-
-TODO: describe how to do it with less of the awesome fancy stuff I put together
-to make it easier on myself to keep an update server going.

amo-version.sh

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

build.sh

@@ -1,112 +0,0 @@
-#! /usr/bin/env bash
-set -e 
-
-SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
-cd "$SCRIPT_DIR" || exit 1
-
-. "$SCRIPT_DIR/i2pversion"
-
-if [ -f i2pversion_override ]; then
-    . "$SCRIPT_DIR/i2pversion_override"
-fi
-
-. "$SCRIPT_DIR/config.sh"
-
-if [ -f config_overide.sh ]; then
-  . "$SCRIPT_DIR/config_override.sh"
-fi
-
-COUNT="Ten Nine Eight Seven Six Five Four Three Two One"
-
-which java
-JAVA=$(java --version | tr -d 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\n' | cut -d ' ' -f 2 | cut -d '.' -f 1 | tr -d '\n\t\- ')
-
-if [ "$JAVA" -lt "14" ]; then
-  echo "Java 14+ must be used to compile with jpackage, java is $JAVA"
-  exit 1
-fi
-if [ "$JAVA" -lt "17" ]; then
-  echo "It is highly recommended that you use Java 17+ to build release packages"
-fi
-
-if [ -z "${JAVA_HOME}" ]; then
-  JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
-fi
-if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
-  JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
-fi
-echo "Building with: $JAVA, $JAVA_HOME"
-sleep 5s
-
-HERE="$PWD"
-if [ ! -d "$HERE/../i2p.i2p.jpackage-build/" ]; then
-  git clone -b "$VERSION" https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/"
-  tar --exclude="$HERE/../i2p.i2p.jpackage-build/.git" -cvzf i2p.i2p.jpackage-build.tar.gz "$HERE/../i2p.i2p.jpackage-build/"
-fi
-cd "$HERE/../i2p.i2p.jpackage-build/"
-for i in $COUNT; do
-  echo -n "$i...."; sleep 1s
-done
-ant distclean pkg || true
-
-cd "$HERE"
-I2P_PKG="$HERE/../i2p.i2p.jpackage-build/pkg-temp"
-RES_DIR="$HERE/../i2p.i2p.jpackage-build/installer/resources"
-I2P_JARS="$I2P_PKG/lib"
-I2P_JBIGI="$HERE/../i2p.i2p.jpackage-build/installer/lib/jbigi"
-
-echo "compiling custom launcher"
-mkdir -p build
-cp "$I2P_JARS"/*.jar build
-if [ ! -f "$HERE/build/jna.jar" ]; then
-  wget -O "$HERE/build/jna.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna/$JNA_VERSION/jna-$JNA_VERSION.jar"
-fi
-
-if [ ! -f "$HERE/build/jna-platform.jar" ]; then
-  wget -O "$HERE/build/jna-platform.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar"
-fi
-
-if [ ! -f "$HERE/build/i2pfirefox.jar" ]; then
-  wget -O "$HERE/build/i2pfirefox.jar" "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar"
-fi
-
-cd java
-"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/i2pfirefox.jar:$HERE/build/jna.jar":"$HERE/build/jna-platform.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar" \
-  net/i2p/router/CopyConfigDir.java \
-  net/i2p/router/Elevator.java \
-  net/i2p/router/Shell32X.java \
-  net/i2p/router/WinLauncher.java \
-  net/i2p/router/WindowsUpdatePostProcessor.java \
-  net/i2p/router/WinUpdateProcess.java
-
-cd ..
-
-#echo "building launcher.jar"
-cd build
-"$JAVA_HOME"/bin/jar -cf launcher.jar net
-cd ..
-
-if [ -z $I2P_VERSION ]; then 
-    I2P_VERSION=$("$JAVA_HOME"/bin/java -cp build/router.jar net.i2p.router.RouterVersion | sed "s/.*: //" | head -n 1 | sed 's|-|.|g')
-fi
-echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
-
-rm -rf I2P
-
-make src/I2P/config
-
-"$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
-  --verbose \
-  --java-options "-Xmx512m" \
-  --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
-  --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
-  --java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
-  --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
-  --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
-  $JPACKAGE_OPTS \
-  --resource-dir build \
-  --app-content src/I2P/config \
-  --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
-
-cp "$I2P_PKG/licenses/"* license/
-cp "$HERE/../i2p.i2p.jpackage-build/LICENSE.txt" license/I2P.txt

buildscripts/build.sh

@@ -0,0 +1,89 @@
+#! /usr/bin/env bash
+set -e 
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f config_overide.sh ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+"$SCRIPT_DIR"/buildscripts/version.sh
+"$SCRIPT_DIR"/buildscripts/licenses.sh
+
+if [ -z $machine ]; then
+  unameOut="$(uname -s)"
+  case "${unameOut}" in
+      Linux*)     machine=Linux;;
+      Darwin*)    machine=Mac;;
+      *)          machine="UNKNOWN:${unameOut}"
+  esac
+fi
+
+ICON="$SCRIPT_DIR/src/icons/ui2pbrowser_icon.ico"
+
+if [ "$machine" = "Mac" ]; then
+  rm -rf I2P
+  "$SCRIPT_DIR"/buildscripts/getprebuilt.sh
+  exit 0
+elif [ "$machine" = "Linux" ]; then
+  rm -rf I2P
+  "$SCRIPT_DIR"/buildscripts/getprebuilt.sh
+  exit 0
+elif [ "$machine" = "unix" ]; then
+  ICON="$SCRIPT_DIR"/src/icons/windowsUIToopie2.png
+  export EXTRACODE="unix"
+  export EXTRA="    public final static String EXTRA = \"-$EXTRACODE\";"
+fi
+
+. "$SCRIPT_DI"$SCRIPT_DIR"/buildscripts/launcher.sh"
+
+if [ -z $I2P_VERSION ]; then 
+    I2P_VERSION=$("$JAVA_HOME"/bin/java -cp $SCRIPT_DIR/build/router.jar net.i2p.router.RouterVersion | sed "s/.*: //" | head -n 1 | sed 's|-|.|g')
+fi
+
+echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
+
+rm -rf I2P
+
+if [ ! -d "I2P" ]; then
+  if echo "$I2P_VERSION" | grep "master"; then
+    RELEASE_VERSION="9.9.9"
+  else
+    RELEASE_VERSION="$I2P_VERSION"
+  fi
+"$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$RELEASE_VERSION" \
+  --verbose \
+  --java-options "-Xmx512m" \
+  --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
+  $JPACKAGE_OPTS \
+  --resource-dir $SCRIPT_DIR/build \
+  --app-content "$SCRIPT_DIR"/src/I2P/config \
+  --app-content "$SCRIPT_DIR"/src/unix/torbrowser.sh \
+  --app-content "$SCRIPT_DIR"/src/win/torbrowser-windows.sh \
+  --app-content "$SCRIPT_DIR"/src/icons/windowsUIToopie2.png \
+  --app-content "$SCRIPT_DIR"/src/icons/ui2pbrowser_icon.ico \
+  --icon "${ICON}" \
+  --input $SCRIPT_DIR/build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
+fi
+
+cp "$I2P_PKG/licenses/"* license/
+cp "$SCRIPT_DIR/../i2p.i2p.jpackage-build/LICENSE.txt" license/I2P.txt
+
+
+mkdir -p "$SCRIPT_DIR"/build/I2P
+cp -rv "$SCRIPT_DIR"/I2P/* "$SCRIPT_DIR"/build/I2P
+cp -rv src/I2P/config build/I2P/config
+zip -r I2P-Prebuilt.zip build/I2P/

buildscripts/clean.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
 cd "$SCRIPT_DIR" || exit 1
 
 . "$SCRIPT_DIR/config.sh"
@@ -31,4 +31,5 @@ rm -rf \
 	*.jar \
 	*.exe \
 	*.dmg
-make clean
+rm -rf build app-profile-*.tgz profile-*.tgz I2P-Easy-Install-Bundle-*.exe *.deb src/I2P/config *.su3 .version *.url make.log
+git clean -fdx src build onionkeys tlskeys i2pkeys

buildscripts/config_override.example.sh

@@ -0,0 +1,82 @@
+#! /usr/bin/env bash
+
+## If you need to use a different JVM, JDK, or other utility from
+# build.sh, set it in this file, for example:
+
+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
+
+if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
+    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
+fi
+
+if [ "${uname}" != "Linux" ]; then
+    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
+fi
+
+
+### TESTING: 
+## 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
+
+## Other potential values(NOT exhaustive):
+
+#export PATH="$PATH:/c/Program Files/Eclipse Adoptium/jdk-17.0.3/bin/"
+#export JAVA_HOME="/c/Program Files/Eclipse Adoptium/jdk-17.0.3"
+#export PATH="$PATH:/c/Program Files/OpenJDK/jdk-17.0.3/bin/"
+#export JAVA_HOME="/c/Program Files/OpenJDK/jdk-17.0.3"
+
+#BREAKS!
+#export PATH=/c/Program Files/GraalVM/graalvm-ce-java17-22.0.0.2/bin
+#export JAVA_HOME=/c/Program Files/GraalVM/graalvm-ce-java17-22.0.0.2
+#BREAKS!
+# might be fun to learn why this is broken
+
+#WORKS WELL! GETS UPDATES AS SOON AS ORACLE! VIABLE ALTERNATIVE!
+#export PATH="$PATH:/c/Program Files/Amazon Corretto/jdk17.0.3_6/bin/"
+#export JAVA_HOME="/c/Program Files/Amazon Corretto/jdk17.0.3_6"
+#WORKS WELL! GETS UPDATES AS SOON AS ORACLE! VIABLE ALTERNATIVE!
+
+# These are all things I built the package with today(April 20, 2022, idk)
+
+# Which will determine, of course, which java compilers you use and where
+# your JAVA_HOME(and thus your bootclasspath jars and stuff) come from.
+# So for you reddit nerds who are all into graalVM or whatever, this might
+# be where you go to mess with that.
+
+## Until 1.7.4, releases were built using Eclipse Adoptium OpenJDK
+# but it lags behind a day or two in security updates which did become
+# a major issue in April 2022. At this point it was migrated to Oracle's
+# JDK distribution which was more up to date. Should you prefer, or simply
+# wish to experiment with a different JVM, copy this file to `config_overrides.sh`
+# and add your JAVA_HOME and $PATH changes.
+
+# 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 [[ -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/"
+fi
+
+if [ "${uname}" != "Linux" ]; then
+    PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+fi

buildscripts/daily-linux.sh

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

buildscripts/daily-portable-windows.sh

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

buildscripts/daily-unstable.sh

@@ -0,0 +1,60 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config_override.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 .
+cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
+"$SCRIPT_DIR"/buildscripts/unsigned.sh
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+TODAYSDATE="$(date +%Y%m%d).java.19.dev.build"
+
+if [ -z "$DESCRIPTION" ]; then
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
+fi
+
+echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+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 "Java 19 Development Build - $EXECHECKSUM" -t "$TODAYSDATE" -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 "Java 19 Development Build - $EXECHECKSUM" -t "$TODAYSDATE" -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 "Java 19 Development Build - $ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.zip" -l "Java 19 Development Build - $ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
+
+TARCHECKSUM=$(sha256sum "../i2p.i2p.jpackage-build.tar.gz")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Java 19 Development Build - Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Java 19 Development Build - Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"

buildscripts/daily.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
 cd "$SCRIPT_DIR" || exit 1
 
 . "$SCRIPT_DIR/i2pversion"
@@ -9,12 +9,9 @@ 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"
 
-if [ -f config_overide.sh ]; then
-  . "$SCRIPT_DIR/config_override.sh"
-fi
-
 ### How to set up this script:
 #
 # This script will not work unless you give it a Github API key.
@@ -25,7 +22,7 @@ fi
 # GITHUB_USERNAME=your github username
 git clean -fd
 git checkout .
-./unsigned.sh
+"$SCRIPT_DIR"/buildscripts/unsigned.sh
 
 . "$HOME/github-release-config.sh"
 
@@ -36,20 +33,24 @@ fi
 TODAYSDATE=$(date +%Y%m%d)
 
 if [ -z "$DESCRIPTION" ]; then
-  DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE"
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
 fi
 
 echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
 github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
-EXECHECKSUM=$(sha256sum "I2P-Profile-Installer-$I2P_VERSION.exe")
-echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Profile-Installer-$I2P_VERSION.exe" -l "$EXECHECKSUM" -t "$TODAYSDATE" -n "I2P-Profile-Installer-$I2P_VERSION.exe"
-github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Profile-Installer-$I2P_VERSION.exe" -l "$EXECHECKSUM" -t "$TODAYSDATE" -n "I2P-Profile-Installer-$I2P_VERSION.exe"
-cd build || exit
-tar -a -cf ../I2P.zip I2P
-ZIPCHECKSUM=$(sha256sum "../I2P.zip")
-echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
-github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
-
-TARCHECKSUM=$(sha256sum "../../i2p.i2p.jpackage-build.tar.gz")
-echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
-github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
+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 "$TODAYSDATE" -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 "$TODAYSDATE" -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 "$TODAYSDATE" -n "I2P.zip"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
+TARCHECKSUM=$(sha256sum "../i2p.i2p.jpackage-build.tar.gz")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../i2p.i2p.jpackage-build.tar.gz" -l "Upstream I2P Router source code $TARCHECKSUM" -t "$TODAYSDATE" -n "i2p.i2p.jpackage-build.tar.gz"

buildscripts/edit-release-unstable.sh

@@ -0,0 +1,38 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+cp -v "$SCRIPT_DIR/config_override.example.sh" config_override.sh
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+TODAYSDATE="$(date +%Y%m%d).java.19.dev.build"
+
+if [ -z "$DESCRIPTION" ]; then
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
+fi
+
+echo github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"

buildscripts/edit-release.sh

@@ -0,0 +1,36 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+. "$HOME/github-release-config.sh"
+
+if [ -f ./i2pversion_override ]; then
+  . ./i2pversion_override
+fi
+
+TODAYSDATE=$(date +%Y%m%d)
+
+if [ -z "$DESCRIPTION" ]; then
+DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE
+===================================================
+
+These builds are automatically built on a daily basis and may have serious bugs.
+They are intended for testing purposes only, use them at your own risk.
+"
+fi
+
+echo github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release edit -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"

buildscripts/exe.sh

@@ -2,12 +2,18 @@
 
 ## EXPERIMENTAL. PROBABLY WON'T SEE THE LIGHT OF DAY BUT MAYBE I GET LUCKY.
 
-# Motivation
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
 
 . ./config.sh
 . ./i2pversion
-./build.sh
-jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
+./buildscripts/build.sh
+if echo "$I2P_VERSION" | grep "master"; then
+    RELEASE_VERSION="9.9.9"
+else
+    RELEASE_VERSION="$I2P_VERSION"
+fi
+jpackage --name I2P-EXE --app-version "$RELEASE_VERSION" \
     --verbose \
     --java-options "-Xmx512m" \
     --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
@@ -16,8 +22,10 @@ jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
     --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
     --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
     $JPACKAGE_OPTS \
-    --app-content src/I2P/config \
-    --input build \
+    --app-content "$SCRIPT_DIR"/src/I2P/config \
+    --app-content "$SCRIPT_DIR"/src/icons/windowsUIToopie2.png \
+    --icon "$SCRIPT_DIR"/src/icons/windowsUIToopie2.png \
+    --input "$SCRIPT_DIR/build" \
     --verbose \
     --type exe \
     --win-dir-chooser \

buildscripts/experimental.sh

@@ -0,0 +1,16 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+"$SCRIPT_DIR"/buildscripts/clean.sh
+"$SCRIPT_DIR"/buildscripts/version.sh
+"$SCRIPT_DIR"/buildscripts/licenses.sh
+"$SCRIPT_DIR"/buildscripts/build.sh
+"$SCRIPT_DIR"/buildscripts/nsis.sh

buildscripts/getprebuilt.sh

@@ -0,0 +1,64 @@
+#! /usr/bin/env bash
+set -e 
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f config_overide.sh ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+"$SCRIPT_DIR"/buildscripts/version.sh
+echo "version set"
+"$SCRIPT_DIR"/buildscripts/licenses.sh
+echo "licenses generated"
+. "$HOME/github-release-config.sh"
+
+if [ -z $TODAYSDATE ]; then
+  TODAYSDATE=$(date -d '-1 day' '+%Y%m%d')
+fi
+
+if [ ! -f I2P.zip ]; then
+  echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE"
+  github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE"
+fi
+unzip -FF I2P.zip || true
+echo "unzipped prebuilt router"
+sleep 3
+
+echo "moved prebuilt router"
+
+cd "$SCRIPT_DIR"
+
+export I2P_PKG="$SCRIPT_DIR/../i2p.i2p.jpackage-build/pkg-temp"
+export RES_DIR="$SCRIPT_DIR/../i2p.i2p.jpackage-build/installer/resources"
+export I2P_JARS="$I2P_PKG/lib"
+export I2P_JBIGI="$SCRIPT_DIR/../i2p.i2p.jpackage-build/installer/lib/jbigi"
+export I2P_JBIGI_JAR="$SCRIPT_DIR/../i2p.i2p.jpackage-build/build/jbigi.jar"
+
+mkdir -p "$SCRIPT_DIR/src/I2P/config"
+rm -rf "$SCRIPT_DIR/src/I2P/config/geoip" "$SCRIPT_DIR/src/I2P/config/webapps" "$SCRIPT_DIR/src/I2P/config/certificates"
+cp -v "$RES_DIR/clients.config" "$SCRIPT_DIR/src/I2P/config/"
+cp -v "$RES_DIR/wrapper.config" "$SCRIPT_DIR/src/I2P/config/"
+#grep -v 'router.updateURL' $(RES_DIR)/router.config > "$SCRIPT_DIR"/src/I2P/config/router.config
+cat router.config > "$SCRIPT_DIR/src/I2P/config/router.config"
+cat i2ptunnel.config > "$SCRIPT_DIR/src/I2P/config/i2ptunnel.config"
+cp -v "$RES_DIR/hosts.txt" "$SCRIPT_DIR/src/I2P/config/hosts.txt"
+cp -r "$RES_DIR/certificates" "$SCRIPT_DIR/src/I2P/config/certificates"
+cp -r "$RES_DIR/eepsite" "$SCRIPT_DIR/src/I2P/config/eepsite"
+mkdir -p "$SCRIPT_DIR/src/I2P/config/geoip"
+cp -v "$RES_DIR/GeoLite2-Country.mmdb.gz" "$SCRIPT_DIR/src/I2P/config/geoip/GeoLite2-Country.mmdb.gz"
+#cp -r "$I2P_PKG/webapps" "$SCRIPT_DIR/src/I2P/config/webapps"
+cd "$SCRIPT_DIR/src/I2P/config/geoip" && gunzip GeoLite2-Country.mmdb.gz; cd "$SCRIPT_DIR"
+
+mkdir -p "$SCRIPT_DIR"/build/I2P
+cp -rv "$SCRIPT_DIR"/I2P/* "$SCRIPT_DIR"/build/I2P
+cp -rv "$SCRIPT_DIR"/src/I2P/config "$SCRIPT_DIR"/build/I2P/config

buildscripts/launcher.sh

@@ -0,0 +1,149 @@
+#! /usr/bin/env bash
+set -e 
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+COUNT="Ten Nine Eight Seven Six Five Four Three Two One"
+
+which java
+export JAVA=$(java --version | tr -d 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\n' | cut -d ' ' -f 2 | cut -d '.' -f 1 | tr -d '\n\t\- ')
+
+if [ "$JAVA" -lt "14" ]; then
+  echo "Java 14+ must be used to compile with jpackage, java is $JAVA"
+  exit 1
+fi
+if [ "$JAVA" -lt "17" ]; then
+  echo "It is highly recommended that you use Java 17+ to build release packages"
+fi
+
+if [ -z "${JAVA_HOME}" ]; then
+  export JAVA_HOME=$(type -p java|xargs readlink -f|xargs dirname|xargs dirname)
+fi
+if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+  export JAVA_HOME=$(type -p java|xargs readlink -f|xargs dirname|xargs dirname)
+fi
+echo "Building with: $JAVA, $JAVA_HOME"
+sleep 5s
+
+"$SCRIPT_DIR"/buildscripts/version.sh
+"$SCRIPT_DIR"/buildscripts/licenses.sh
+
+#SCRIPT_DIR="$PWD"
+export I2P_PKG="$SCRIPT_DIR/../i2p.i2p.jpackage-build/pkg-temp"
+export RES_DIR="$SCRIPT_DIR/../i2p.i2p.jpackage-build/installer/resources"
+export I2P_JARS="$I2P_PKG/lib"
+export I2P_JBIGI="$SCRIPT_DIR/../i2p.i2p.jpackage-build/installer/lib/jbigi"
+export I2P_JBIGI_JAR="$SCRIPT_DIR/../i2p.i2p.jpackage-build/build/jbigi.jar"
+if [ ! -d "$SCRIPT_DIR/../i2p.i2p.jpackage-build/" ]; then
+  if [ -d "$SCRIPT_DIR/../i2p.i2p/" ]; then
+    echo cloning from local i2p.i2p checkout
+    git clone --depth=1 -b "$VERSION" -l "$SCRIPT_DIR/../i2p.i2p/" "$SCRIPT_DIR/../i2p.i2p.jpackage-build/"
+  else
+    echo cloning from remote i2p.i2p repository
+    git clone --depth=1 -b "$VERSION" https://i2pgit.org/I2P_Developers/i2p.i2p "$SCRIPT_DIR/../i2p.i2p.jpackage-build/"
+  fi
+fi
+cd "$SCRIPT_DIR/../i2p.i2p.jpackage-build/"
+echo "setting up git branch for build"
+OLDEXTRA=$(find . -name RouterVersion.java -exec grep 'String EXTRA' {} \;)
+if [ -z "$EXTRA" ]; then
+  export EXTRACODE="win"
+  export EXTRA="    public final static String EXTRA = \"-$EXTRACODE\";"
+fi
+if [ "$VERSION" = master ]; then
+  VERSIONDATE="$(date +%m%d)"
+else
+  export TAG_VERSION="$VERSION"
+fi
+echo "build is: i2p-$TAG_VERSION-$VERSIONDATE-$EXTRACODE"
+
+find . -name RouterVersion.java -exec sed -i "s|$OLDEXTRA|$EXTRA|g" {} \;
+git switch - || :
+git pull --tags
+git checkout -b "i2p-$TAG_VERSION-$VERSIONDATE-$EXTRACODE" || :
+git commit -am "i2p-$TAG_VERSION-$VERSIONDATE-$EXTRACODE" || :
+git archive --format=tar.gz --output="$SCRIPT_DIR/../i2p.firefox/i2p.i2p.jpackage-build.tar.gz" "i2p-$TAG_VERSION-$VERSIONDATE-$EXTRACODE"
+git checkout "i2p-$TAG_VERSION-$VERSIONDATE-$EXTRACODE" || :
+
+for i in $COUNT; do
+  echo -n "$i...."; sleep 1s
+done
+ant distclean pkg || true
+ant jbigi
+
+cd "$SCRIPT_DIR"
+
+mkdir -p "$SCRIPT_DIR/src/I2P/config"
+rm -rf "$SCRIPT_DIR/src/I2P/config/geoip" "$SCRIPT_DIR/src/I2P/config/webapps" "$SCRIPT_DIR/src/I2P/config/certificates" "$SCRIPT_DIR/src/I2P/config/eepsite"
+cp -v "$RES_DIR/clients.config" "$SCRIPT_DIR/src/I2P/config/"
+cp -v "$RES_DIR/wrapper.config" "$SCRIPT_DIR/src/I2P/config/"
+#grep -v 'router.updateURL' $(RES_DIR)/router.config > "$SCRIPT_DIR"/src/I2P/config/router.config
+cat router.config > "$SCRIPT_DIR/src/I2P/config/router.config"
+cat i2ptunnel.config > "$SCRIPT_DIR/src/I2P/config/i2ptunnel.config"
+cp -v "$RES_DIR/hosts.txt" "$SCRIPT_DIR/src/I2P/config/hosts.txt"
+cp -R "$RES_DIR/certificates" "$SCRIPT_DIR/src/I2P/config/certificates"
+cp -R "$RES_DIR/eepsite" "$SCRIPT_DIR/src/I2P/config/eepsite"
+mkdir -p "$SCRIPT_DIR/src/I2P/config/geoip"
+cp -v "$RES_DIR/GeoLite2-Country.mmdb.gz" "$SCRIPT_DIR/src/I2P/config/geoip/GeoLite2-Country.mmdb.gz"
+cp -R "$I2P_PKG/webapps" "$SCRIPT_DIR/src/I2P/config/webapps"
+cd "$SCRIPT_DIR/src/I2P/config/geoip" && gunzip GeoLite2-Country.mmdb.gz; cd ../../..
+
+echo "compiling custom launcher"
+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
+  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
+  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.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/src/I2P/config/plugins/i2pfirefox" ]; then
+  mkdir -p "$SCRIPT_DIR/src/I2P/config/plugins/"
+  unzip "$SCRIPT_DIR/build/i2pfirefox.zip" -d "$SCRIPT_DIR/src/I2P/config/plugins/"
+  rm -rf "$SCRIPT_DIR/src/I2P/config/plugins/i2pfirefox"
+  mv "$SCRIPT_DIR/src/I2P/config/plugins/plugin" "$SCRIPT_DIR/src/I2P/config/plugins/i2pfirefox"
+fi
+
+for dll in "$I2P_JBIGI/"*windows*.dll; do
+  jar uf "$SCRIPT_DIR/build/jbigi.jar" "$dll"
+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" \
+  net/i2p/router/I2PAppUtil.java \
+  net/i2p/router/WindowsAppUtil.java \
+  net/i2p/router/WindowsServiceUtil.java \
+  net/i2p/router/WinLauncher.java \
+  net/i2p/router/WinUpdatePostProcessor.java \
+  net/i2p/router/WinUpdateProcess.java \
+  net/i2p/router/ZipUpdateProcess.java
+
+cd ..
+
+#echo "building launcher.jar"
+cd "$SCRIPT_DIR/build"
+"$JAVA_HOME"/bin/jar -cf launcher.jar net
+cd ..

buildscripts/licenses.sh

@@ -0,0 +1,31 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+mkdir -p "$SCRIPT_DIR"/build/licenses
+	cp "$SCRIPT_DIR"/license/* "$SCRIPT_DIR"/build/licenses
+	cp "$SCRIPT_DIR"/LICENSE.md "$SCRIPT_DIR"/build/licenses/MIT.txt
+	cat "$SCRIPT_DIR"/build/licenses/LICENSE.index \
+		"$SCRIPT_DIR"/build/licenses/EPL.txt \
+		"$SCRIPT_DIR"/build/licenses/GPL+CLASSPATH.txt \
+		"$SCRIPT_DIR"/build/licenses/HTTPS-Everywhere.txt \
+		"$SCRIPT_DIR"/build/licenses/LICENSE.tor \
+		"$SCRIPT_DIR"/build/licenses/MIT.txt \
+		"$SCRIPT_DIR"/build/licenses/MPL2.txt \
+		"$SCRIPT_DIR"/build/licenses/NoScript.txt \
+		"$SCRIPT_DIR"/build/licenses/NSS.txt \
+		"$SCRIPT_DIR"/build/licenses/I2P.txt > "$SCRIPT_DIR"/build/licenses/LICENSE.txt
+	unix2dos "$SCRIPT_DIR"/build/licenses/LICENSE.txt

buildscripts/msi.sh

@@ -2,13 +2,19 @@
 
 ## EXPERIMENTAL. PROBABLY WON'T SEE THE LIGHT OF DAY BUT MAYBE I GET LUCKY.
 
-# Motivation
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
 
 . ./config.sh
 . ./i2pversion
 
-./build.sh
-jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
+"$SCRIPT_DIR"/buildscripts/build.sh
+if echo "$I2P_VERSION" | grep "master"; then
+    RELEASE_VERSION="9.9.9"
+else
+    RELEASE_VERSION="$I2P_VERSION"
+fi
+jpackage --name I2P-MSI --app-version "$RELEASE_VERSION" \
     --verbose \
     --java-options "-Xmx512m" \
     --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
@@ -17,8 +23,10 @@ jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
     --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
     --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
     $JPACKAGE_OPTS \
-    --app-content src/I2P/config \
-    --input build \
+    --app-content "$SCRIPT_DIR"/src/I2P/config \
+    --app-content "$SCRIPT_DIR"/src/icons/windowsUIToopie2.png \
+    --icon "$SCRIPT_DIR"/src/icons/windowsUIToopie2.png \
+    --input "$SCRIPT_DIR/build" \
     --verbose \
     --type msi \
     --win-dir-chooser \

buildscripts/news.sh

@@ -0,0 +1,67 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+if [ -z "$I2P_NEWSXML" ]; then
+    if [ -d "../i2p.newsxml" ]; then
+        export I2P_NEWSXML="../i2p.newsxml"
+    else 
+        echo "i2p.newsxml is not in the parent directory and I2P_NEWSXML is unset"
+        exit 1
+    fi
+fi
+
+cd "$I2P_NEWSXML" || exit 1 
+export TITLE="Easy-Install for Windows Release $I2P_VERSION"
+echo "$TITLE"
+export AUTHOR=idk
+echo "$AUTHOR"
+export EDITOR=true
+echo "canceled manual editor"
+export I2P_OS=win
+echo "$I2P_OS"
+export I2P_BRANCH=beta
+echo "$I2P_VERSION"
+export SUMMARY_HERE=$(head -n 1 "$SCRIPT_DIR/docs/RELEASE.md" | sed "s|# ||g")
+echo "$SUMMARY_HERE"
+export CONTENT_HERE=$(tail -n +2 "$SCRIPT_DIR/docs/RELEASE.md" | markdown)
+echo "$CONTENT_HERE" > news-content.html
+unset CONTENT_HERE
+./create_new_entry.sh
+
+export DATE=$(date +%Y-%m-%d)
+echo "$DATE"
+MAGNET=$(transmission-show -m "$SCRIPT_DIR/i2pwinupdate.su3.torrent" 2>&1 3>&1 | tail -n 1)
+
+TORRENTJSON='['
+TORRENTJSON+='  {'
+TORRENTJSON+="    \"date\": \"$DATE\","
+TORRENTJSON+="    \"version\": \"$I2P_VERSION\","
+TORRENTJSON+="    \"minVersion\": \"1.5.0\","
+TORRENTJSON+="    \"minJavaVersion\": \"1.8\","
+TORRENTJSON+="    \"updates\": {"
+TORRENTJSON+="      \"su3\": {"
+TORRENTJSON+="        \"torrent\": \"$MAGNET\","
+TORRENTJSON+="        \"url\": ["
+TORRENTJSON+="          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""
+TORRENTJSON+='        ]'
+TORRENTJSON+='      }'
+TORRENTJSON+='    }'
+TORRENTJSON+='  }'
+TORRENTJSON+=']'
+
+echo "$TORRENTJSON" | jq > "$I2P_NEWSXML/data/win/beta/releases.json"
+echo "$TORRENTJSON" | jq > "$I2P_NEWSXML/data/win/testing/releases.json"

buildscripts/nsis.sh

@@ -0,0 +1,21 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+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 && makensisi i2pbrowser-installer.nsi && cp I2P-Easy-Install-Bundle-*.exe ../ && echo "built windows installer"

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-firefox-$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" -t "i2p-firefox-$I2P_VERSION"
+
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-windows-portable.zip" -t "$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P-windows-portable.zip" -t "i2p-firefox-$I2P_VERSION"
+
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "i2p-firefox-$I2P_VERSION"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "i2p.i2p.jpackage-build.tar.gz" -t "i2p-firefox-$I2P_VERSION"
+
+echo github-release download -u "$GITHUB_USERNAME" -r i2p.firefox -t "i2p-firefox-$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"
+github-release download -u "$GITHUB_USERNAME" -r i2p.firefox -t "i2p-firefox-$I2P_VERSION" -n "./I2P-jpackage-windows-$I2P_VERSION.zip"

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

buildscripts/release-torrent.sh

@@ -0,0 +1,48 @@
+#! /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
+
+if [ ! -f "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" ]; then
+	wget -c "https://github.com/eyedeekay/i2p.firefox/releases/download/i2p-firefox-$I2P_VERSION/I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+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
+
+java -cp "$I2P_LIBS/*" "org.klomp.snark.Storage" -a http://tracker2.postman.i2p/announce.php -c "$SIGNER" -m "Official torrent for Windows Easy-Install version $I2P_VERSION" i2pwinupdate.su3
+echo "~~~~~~~~~~"
+MAGNET=$(transmission-show -m "i2pwinupdate.su3.torrent" 2>&1 3>&1 | tail -n 1)
+echo "$MAGNET"
+ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3")
+echo github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
+github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3"
+ZIPCHECKSUM=$(sha256sum "i2pwinupdate.su3.torrent")
+echo github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"
+github-release upload -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "i2pwinupdate.su3.torrent" -l "$ZIPCHECKSUM" -t "i2p-firefox-$I2P_VERSION" -n "i2pwinupdate.su3.torrent"

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"

buildscripts/release.sh

@@ -0,0 +1,13 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+"$SCRIPT_DIR"/buildscripts/unsigned.sh
+"$SCRIPT_DIR"/buildscripts/sign.sh

buildscripts/sign.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
 cd "$SCRIPT_DIR" || exit 1
 
 . "$SCRIPT_DIR/i2pversion"
@@ -11,7 +11,7 @@ fi
 
 . "$SCRIPT_DIR/config.sh"
 
-if [ -f config_overide.sh ]; then
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
   . "$SCRIPT_DIR/config_override.sh"
 fi
 
@@ -37,9 +37,11 @@ linuxsign() {
 
 if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
     JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
-    linuxsign I2P-Profile-Installer-$I2P_VERSION.exe
-    cp "I2P-Profile-Installer-$I2P_VERSION.exe" "I2P-Profile-Installer-$I2P_VERSION-signed.exe"
+    linuxsign I2P-Easy-Install-Bundle-$I2P_VERSION.exe
+    cp "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" "I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe"
 else
-    signtool.exe sign -a "I2P-Profile-Installer-$I2P_VERSION.exe"
-    cp "I2P-Profile-Installer-$I2P_VERSION.exe" "I2P-Profile-Installer-$I2P_VERSION-signed.exe"
+    #signtool.exe sign -a "I2P-Easy-Install-Bundle-$I2P_VERSION.exe"
+    echo "WARNING: Signing is temporarily disabled for the installer."
+    sleep 5s
+    cp "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" "I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe"
 fi

buildscripts/targz.sh

@@ -0,0 +1,31 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+export machine=unix
+"$SCRIPT_DIR"/buildscripts/clean.sh
+"$SCRIPT_DIR"/buildscripts/build.sh
+cd "$SCRIPT_DIR/I2P" || exit 1
+
+TORSOCKS=$(which torsocks)
+if [ -f "${TORSOCKS}" ]; then
+    . "${TORSOCKS}" on
+fi
+"$SCRIPT_DIR"/src/unix/torbrowser.sh
+version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
+. "${TORSOCKS}" off
+locale="en-US" # mention your locale. default = en-US
+if [ -d /etc/default/locale ]; then
+    . /etc/default/locale
+    locale=$(echo "${LANG}" | cut -d . -f1)
+fi
+rm -vrf "tor-browser_${locale}"
+cd "$SCRIPT_DIR" || exit 1
+
+tar czvf I2P.tar.gz I2P

buildscripts/unsigned.sh

@@ -0,0 +1,14 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || cd ../ ; SCRIPT_DIR=$(pwd)
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+"$SCRIPT_DIR"/buildscripts/clean.sh
+"$SCRIPT_DIR"/buildscripts/build.sh
+"$SCRIPT_DIR"/buildscripts/nsis.sh

buildscripts/version.sh

@@ -0,0 +1,26 @@
+#! /usr/bin/env bash
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+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 $I2P_VERSION" > "$SCRIPT_DIR"/src/nsis/i2pbrowser-jpackage.nsi
+
+mkdir -p "$SCRIPT_DIR"/build
+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

buildscripts/wine-jpackage.sh

@@ -0,0 +1,5 @@
+#! /usr/bin/env sh
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)/..
+cd "$SCRIPT_DIR" || exit 1
+

buildscripts/zip.sh

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

changelog.txt

@@ -1,3 +1,28 @@
+2025-06-05 idk
+ * Remove Chromium support completely. Much smaller binary now.
+ * Version 2.9.0
+
+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.
+
+2022-09-20 idk
+ * improve compatibility with local service installs and with un-bundled installs side-by-side with bundled intalls
+ * version 1.9.7
+
+2022-09-18 idk
+ * remove unstable/deprecated targets from Makefile.
+ * make it fatal if a jpackaged I2P is not found, the profile launcher is now part of the jpackage
+
+2022-09-16 idk
+ * remove unstable/deprecated functionality. Better solutions have been developed and instructions
+ on how to use them are provided.
+ * update build documentation.
+
+2022-09-13 idk
+ * make it a "portable" application in that the entire app and config can be carried on a portable
+ storage device. Requires minor tweaks to work well still.
+
 2022-09-08 idk
  * Generate a source tarball when we checkout a branch of i2p.i2p
  * Upload a source tarball when we do a daily build
@@ -126,3 +151,24 @@
 * start a changelog
 * add version to the profile, independent of installer version
   - version 0.1 corresponds to IDK version 0.03b
+
+## Checksums
+
+```
+621301bd5f0e0ef1879ed16f8a40d5da9444525755736411fe1e326192f90cb2  I2P-EXE-2.4.992.exe
+decbdef9ef24f6b614027afb006dc7ee4b4817f48a25dbd6af440a6f2be5ecb3  I2P-Easy-Install-Bundle-2.4.992.exe
+bf6f5d162885798072cd61c098bbe871571ac116aaed411b330bab247064e399  I2P-MSI-2.4.992.msi
+0b9c68a6d97727140e56bc80c0096db9340ce12d5bdb7cc3252713a7bb0d33ca  I2P-windows-portable.zip
+18d68eeb61762f0b8cef3505802b5d4a2fa1327fa0fd8f2f41775328361be60b  I2P.tar.gz
+669d353ea064a6a660ef94e8d70728f011e81f98b0fbf298b4d124bbcec7ba83  changelog.txt
+```
+
+```
+I2P-EXE-2.4.992.exe:                 PE32+ executable (GUI) x86-64, for MS Windows
+I2P-Easy-Install-Bundle-2.4.992.exe: PE32 executable (GUI) Intel 80386, for MS Windows, Nullsoft Installer self-extracting archive
+I2P-MSI-2.4.992.msi:                 Composite Document File V2 Document, Little Endian, Os: Windows, Version 6.2, MSI Installer, Code page: 1252, Title: Installation Database, Subject: I2P-MSI, Author: Unknown, Keywords: Installer, Comments: This installer database contains the logic and data required to install I2P-MSI., Template: x64;1033, Revision Number: {F44ACC17-351A-4424-A4F5-7F9E52BBE96E}, Create Time/Date: Wed Mar 20 02:46:40 2024, Last Saved Time/Date: Wed Mar 20 02:46:40 2024, Number of Pages: 200, Number of Words: 10, Name of Creating Application: Windows Installer XML Toolset (3.14.0.8606), Security: 2
+I2P-windows-portable.zip:            Zip archive data, at least v2.0 to extract, compression method=deflate
+I2P.tar.gz:                          gzip compressed data, from Unix, original size modulo 2^32 766935040
+changelog.txt:                       ASCII text
+```
+

config.sh

@@ -5,26 +5,85 @@
 
 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 OpenJDK17
+# 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
 
-## Other potential values(NOT exhaustive):
+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-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
-    export PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
-    JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
-    export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
+    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-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
-    export PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
-    JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
-    export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
+    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
 
+
+### TESTING: 
+## 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-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):
+
 #export PATH="$PATH:/c/Program Files/Eclipse Adoptium/jdk-17.0.3/bin/"
 #export JAVA_HOME="/c/Program Files/Eclipse Adoptium/jdk-17.0.3"
 #export PATH="$PATH:/c/Program Files/OpenJDK/jdk-17.0.3/bin/"
@@ -58,15 +117,28 @@ 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/"
     export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
+    export PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
 fi
 
 if [ "${uname}" != "Linux" ]; then
     PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
     export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
+    PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
+    export PATH="$PATH:C:\Users\user\Downloads\m4-1.4.14-1-bin\bin"
 fi

darklight.css

@@ -0,0 +1,24 @@
+/* edgar darklight CSS file */
+#checkboxDarkLight:checked + .container {
+    background-color: #202020;
+    filter: invert(100%);
+}
+#checkboxDarkLight{
+    appearance: none;
+    width: 80px;
+    height: 40px;
+    background: black;
+    border-radius: 22px;
+    cursor: pointer;
+    outline: none;
+}
+#checkboxDarkLight::before{
+    content: '';
+    width: 40px;
+    height: 35px;
+    background-color:white;
+    border-radius: 35px;
+    cursor: pointer;
+    transition: .3s linear;
+}
+

debian/README.Debian

@@ -1,9 +0,0 @@
-i2p-firefox-profile for Debian
------------------------------
-
-This is a Firefox Profile and a bundle of Open-Source extensions which are
-packaged for convenience as a Debian-style package. The extensions themselves
-may not be packaged in Debian. They are side-loaded on the first run of the
-browser profile.
-
- -- idk <hankhill19580@gmail.com>  Sat, 03 Jul 2021 23:32:29 -0400

debian/changelog

@@ -1,5 +0,0 @@
-i2p-firefox-profile (1.05.0-1) sid; urgency=medium
-
-  * Initial release. Closes i2pgit.org/i2p-hackers/i2p.firefox #5
-
- -- eyedeekay <hankhill19580@gmail.com>  Sun, 22 Aug 2021 22:27:37 -0400

debian/control

@@ -1,20 +0,0 @@
-Source: i2p-firefox-profile
-Section: net
-Priority: optional
-Maintainer: idk <hankhill19580@gmail.com>
-Build-Depends: debhelper-compat (= 11)
-Standards-Version: 4.5.1
-Homepage: https://i2pgit.org/i2p-hackers/i2p.firefox
-Vcs-Browser: https://i2pgit.org/i2p-hackers/i2p.firefox
-Vcs-Git: https://i2pgit.org/i2p-hackers/i2p.firefox.git
-Rules-Requires-Root: no
-
-Package: i2p-firefox-profile
-Architecture: all
-Depends: firefox,wget,i2p | i2pd,${misc:Depends}
-Suggests: i2p,i2p-router,syndie,tor,tsocks
-Description: Browser profile for Firefox+I2P and script to launch it
- Debian/Ubuntu port of the I2P Browser Profile for Firefox/Windows
- systems. It is built from the same source and has identical
- functionality to the Windows version, and in most ways should appear
- nearly identical to it's Windows equivalent.

debian/copyright

@@ -1,865 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: i2p-firefox-profile
-Upstream-Contact: idk hankhill19580@gmail.com
-Source: https://i2pgit.org/i2p-hackers/i2p.firefox
-
-Files: *
-Copyright: 2018 The Invisible Internet Project
-License: MIT
-
-Files: debian/*
-Copyright: 2021 idk <hankhill19580@gmail.com>
-License: MIT
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation
- the rights to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-# HTTPS Everwyhere:
-# Copyright © 2010-2012 Mike Perry <mikeperry@fscked.org>
-#                       Peter Eckersley <pde@eff.org>
-#                       and many others
-#                       (Licensed GPL v2+)
-# 
-# Incorporating code from NoScript,
-# Copyright © 2004-2007 Giorgio Maone <g.maone@informaction.com>
-# Licensed GPL v2+
-# 
-# Incorporating code from Convergence
-# Copyright © Moxie Marlinspike
-# Licensed GPL v3+
-# 
-# Incorporating code from URI.js
-# Copyright © Rodney Rehm
-# Licensed MIT, GPL V3
-# 
-# Incorporating code from js-lru
-# Copyright © 2010 Rasmus Andersson
-# Licensed MIT
-# 
-# The build system incorporates code from Python 2.6,
-# Copyright © 2001-2006 Python Software Foundation
-# Python Software Foundation License Version 2
-# 
-# Net License:  GPL v3+ (complete tree)
-#               GPL v2+ (if Moxie's NSS.js is absent)
-# 
-# 
-# Text of MIT License:
-# ====================
-# Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-# MIT License
-# 
-# Copyright (c) 2019 idk
-# 
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-# 
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-# Mozilla Public License Version 2.0
-# ==================================
-# 
-# 1. Definitions
-# --------------
-# 
-# 1.1. "Contributor"
-#     means each individual or legal entity that creates, contributes to
-#     the creation of, or owns Covered Software.
-# 
-# 1.2. "Contributor Version"
-#     means the combination of the Contributions of others (if any) used
-#     by a Contributor and that particular Contributor's Contribution.
-# 
-# 1.3. "Contribution"
-#     means Covered Software of a particular Contributor.
-# 
-# 1.4. "Covered Software"
-#     means Source Code Form to which the initial Contributor has attached
-#     the notice in Exhibit A, the Executable Form of such Source Code
-#     Form, and Modifications of such Source Code Form, in each case
-#     including portions thereof.
-# 
-# 1.5. "Incompatible With Secondary Licenses"
-#     means
-# 
-#     (a) that the initial Contributor has attached the notice described
-#         in Exhibit B to the Covered Software; or
-# 
-#     (b) that the Covered Software was made available under the terms of
-#         version 1.1 or earlier of the License, but not also under the
-#         terms of a Secondary License.
-# 
-# 1.6. "Executable Form"
-#     means any form of the work other than Source Code Form.
-# 
-# 1.7. "Larger Work"
-#     means a work that combines Covered Software with other material, in
-#     a separate file or files, that is not Covered Software.
-# 
-# 1.8. "License"
-#     means this document.
-# 
-# 1.9. "Licensable"
-#     means having the right to grant, to the maximum extent possible,
-#     whether at the time of the initial grant or subsequently, any and
-#     all of the rights conveyed by this License.
-# 
-# 1.10. "Modifications"
-#     means any of the following:
-# 
-#     (a) any file in Source Code Form that results from an addition to,
-#         deletion from, or modification of the contents of Covered
-#         Software; or
-# 
-#     (b) any new file in Source Code Form that contains any Covered
-#         Software.
-# 
-# 1.11. "Patent Claims" of a Contributor
-#     means any patent claim(s), including without limitation, method,
-#     process, and apparatus claims, in any patent Licensable by such
-#     Contributor that would be infringed, but for the grant of the
-#     License, by the making, using, selling, offering for sale, having
-#     made, import, or transfer of either its Contributions or its
-#     Contributor Version.
-# 
-# 1.12. "Secondary License"
-#     means either the GNU General Public License, Version 2.0, the GNU
-#     Lesser General Public License, Version 2.1, the GNU Affero General
-#     Public License, Version 3.0, or any later versions of those
-#     licenses.
-# 
-# 1.13. "Source Code Form"
-#     means the form of the work preferred for making modifications.
-# 
-# 1.14. "You" (or "Your")
-#     means an individual or a legal entity exercising rights under this
-#     License. For legal entities, "You" includes any entity that
-#     controls, is controlled by, or is under common control with You. For
-#     purposes of this definition, "control" means (a) the power, direct
-#     or indirect, to cause the direction or management of such entity,
-#     whether by contract or otherwise, or (b) ownership of more than
-#     fifty percent (50%) of the outstanding shares or beneficial
-#     ownership of such entity.
-# 
-# 2. License Grants and Conditions
-# --------------------------------
-# 
-# 2.1. Grants
-# 
-# Each Contributor hereby grants You a world-wide, royalty-free,
-# non-exclusive license:
-# 
-# (a) under intellectual property rights (other than patent or trademark)
-#     Licensable by such Contributor to use, reproduce, make available,
-#     modify, display, perform, distribute, and otherwise exploit its
-#     Contributions, either on an unmodified basis, with Modifications, or
-#     as part of a Larger Work; and
-# 
-# (b) under Patent Claims of such Contributor to make, use, sell, offer
-#     for sale, have made, import, and otherwise transfer either its
-#     Contributions or its Contributor Version.
-# 
-# 2.2. Effective Date
-# 
-# The licenses granted in Section 2.1 with respect to any Contribution
-# become effective for each Contribution on the date the Contributor first
-# distributes such Contribution.
-# 
-# 2.3. Limitations on Grant Scope
-# 
-# The licenses granted in this Section 2 are the only rights granted under
-# this License. No additional rights or licenses will be implied from the
-# distribution or licensing of Covered Software under this License.
-# Notwithstanding Section 2.1(b) above, no patent license is granted by a
-# Contributor:
-# 
-# (a) for any code that a Contributor has removed from Covered Software;
-#     or
-# 
-# (b) for infringements caused by: (i) Your and any other third party's
-#     modifications of Covered Software, or (ii) the combination of its
-#     Contributions with other software (except as part of its Contributor
-#     Version); or
-# 
-# (c) under Patent Claims infringed by Covered Software in the absence of
-#     its Contributions.
-# 
-# This License does not grant any rights in the trademarks, service marks,
-# or logos of any Contributor (except as may be necessary to comply with
-# the notice requirements in Section 3.4).
-# 
-# 2.4. Subsequent Licenses
-# 
-# No Contributor makes additional grants as a result of Your choice to
-# distribute the Covered Software under a subsequent version of this
-# License (see Section 10.2) or under the terms of a Secondary License (if
-# permitted under the terms of Section 3.3).
-# 
-# 2.5. Representation
-# 
-# Each Contributor represents that the Contributor believes its
-# Contributions are its original creation(s) or it has sufficient rights
-# to grant the rights to its Contributions conveyed by this License.
-# 
-# 2.6. Fair Use
-# 
-# This License is not intended to limit any rights You have under
-# applicable copyright doctrines of fair use, fair dealing, or other
-# equivalents.
-# 
-# 2.7. Conditions
-# 
-# Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-# in Section 2.1.
-# 
-# 3. Responsibilities
-# -------------------
-# 
-# 3.1. Distribution of Source Form
-# 
-# All distribution of Covered Software in Source Code Form, including any
-# Modifications that You create or to which You contribute, must be under
-# the terms of this License. You must inform recipients that the Source
-# Code Form of the Covered Software is governed by the terms of this
-# License, and how they can obtain a copy of this License. You may not
-# attempt to alter or restrict the recipients' rights in the Source Code
-# Form.
-# 
-# 3.2. Distribution of Executable Form
-# 
-# If You distribute Covered Software in Executable Form then:
-# 
-# (a) such Covered Software must also be made available in Source Code
-#     Form, as described in Section 3.1, and You must inform recipients of
-#     the Executable Form how they can obtain a copy of such Source Code
-#     Form by reasonable means in a timely manner, at a charge no more
-#     than the cost of distribution to the recipient; and
-# 
-# (b) You may distribute such Executable Form under the terms of this
-#     License, or sublicense it under different terms, provided that the
-#     license for the Executable Form does not attempt to limit or alter
-#     the recipients' rights in the Source Code Form under this License.
-# 
-# 3.3. Distribution of a Larger Work
-# 
-# You may create and distribute a Larger Work under terms of Your choice,
-# provided that You also comply with the requirements of this License for
-# the Covered Software. If the Larger Work is a combination of Covered
-# Software with a work governed by one or more Secondary Licenses, and the
-# Covered Software is not Incompatible With Secondary Licenses, this
-# License permits You to additionally distribute such Covered Software
-# under the terms of such Secondary License(s), so that the recipient of
-# the Larger Work may, at their option, further distribute the Covered
-# Software under the terms of either this License or such Secondary
-# License(s).
-# 
-# 3.4. Notices
-# 
-# You may not remove or alter the substance of any license notices
-# (including copyright notices, patent notices, disclaimers of warranty,
-# or limitations of liability) contained within the Source Code Form of
-# the Covered Software, except that You may alter any license notices to
-# the extent required to remedy known factual inaccuracies.
-# 
-# 3.5. Application of Additional Terms
-# 
-# You may choose to offer, and to charge a fee for, warranty, support,
-# indemnity or liability obligations to one or more recipients of Covered
-# Software. However, You may do so only on Your own behalf, and not on
-# behalf of any Contributor. You must make it absolutely clear that any
-# such warranty, support, indemnity, or liability obligation is offered by
-# You alone, and You hereby agree to indemnify every Contributor for any
-# liability incurred by such Contributor as a result of warranty, support,
-# indemnity or liability terms You offer. You may include additional
-# disclaimers of warranty and limitations of liability specific to any
-# jurisdiction.
-# 
-# 4. Inability to Comply Due to Statute or Regulation
-# ---------------------------------------------------
-# 
-# If it is impossible for You to comply with any of the terms of this
-# License with respect to some or all of the Covered Software due to
-# statute, judicial order, or regulation then You must: (a) comply with
-# the terms of this License to the maximum extent possible; and (b)
-# describe the limitations and the code they affect. Such description must
-# be placed in a text file included with all distributions of the Covered
-# Software under this License. Except to the extent prohibited by statute
-# or regulation, such description must be sufficiently detailed for a
-# recipient of ordinary skill to be able to understand it.
-# 
-# 5. Termination
-# --------------
-# 
-# 5.1. The rights granted under this License will terminate automatically
-# if You fail to comply with any of its terms. However, if You become
-# compliant, then the rights granted under this License from a particular
-# Contributor are reinstated (a) provisionally, unless and until such
-# Contributor explicitly and finally terminates Your grants, and (b) on an
-# ongoing basis, if such Contributor fails to notify You of the
-# non-compliance by some reasonable means prior to 60 days after You have
-# come back into compliance. Moreover, Your grants from a particular
-# Contributor are reinstated on an ongoing basis if such Contributor
-# notifies You of the non-compliance by some reasonable means, this is the
-# first time You have received notice of non-compliance with this License
-# from such Contributor, and You become compliant prior to 30 days after
-# Your receipt of the notice.
-# 
-# 5.2. If You initiate litigation against any entity by asserting a patent
-# infringement claim (excluding declaratory judgment actions,
-# counter-claims, and cross-claims) alleging that a Contributor Version
-# directly or indirectly infringes any patent, then the rights granted to
-# You by any and all Contributors for the Covered Software under Section
-# 2.1 of this License shall terminate.
-# 
-# 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-# end user license agreements (excluding distributors and resellers) which
-# have been validly granted by You or Your distributors under this License
-# prior to termination shall survive termination.
-# 
-# ************************************************************************
-# *                                                                      *
-# *  6. Disclaimer of Warranty                                           *
-# *  -------------------------                                           *
-# *                                                                      *
-# *  Covered Software is provided under this License on an "as is"       *
-# *  basis, without warranty of any kind, either expressed, implied, or  *
-# *  statutory, including, without limitation, warranties that the       *
-# *  Covered Software is free of defects, merchantable, fit for a        *
-# *  particular purpose or non-infringing. The entire risk as to the     *
-# *  quality and performance of the Covered Software is with You.        *
-# *  Should any Covered Software prove defective in any respect, You     *
-# *  (not any Contributor) assume the cost of any necessary servicing,   *
-# *  repair, or correction. This disclaimer of warranty constitutes an   *
-# *  essential part of this License. No use of any Covered Software is   *
-# *  authorized under this License except under this disclaimer.         *
-# *                                                                      *
-# ************************************************************************
-# 
-# ************************************************************************
-# *                                                                      *
-# *  7. Limitation of Liability                                          *
-# *  --------------------------                                          *
-# *                                                                      *
-# *  Under no circumstances and under no legal theory, whether tort      *
-# *  (including negligence), contract, or otherwise, shall any           *
-# *  Contributor, or anyone who distributes Covered Software as          *
-# *  permitted above, be liable to You for any direct, indirect,         *
-# *  special, incidental, or consequential damages of any character      *
-# *  including, without limitation, damages for lost profits, loss of    *
-# *  goodwill, work stoppage, computer failure or malfunction, or any    *
-# *  and all other commercial damages or losses, even if such party      *
-# *  shall have been informed of the possibility of such damages. This   *
-# *  limitation of liability shall not apply to liability for death or   *
-# *  personal injury resulting from such party's negligence to the       *
-# *  extent applicable law prohibits such limitation. Some               *
-# *  jurisdictions do not allow the exclusion or limitation of           *
-# *  incidental or consequential damages, so this exclusion and          *
-# *  limitation may not apply to You.                                    *
-# *                                                                      *
-# ************************************************************************
-# 
-# 8. Litigation
-# -------------
-# 
-# Any litigation relating to this License may be brought only in the
-# courts of a jurisdiction where the defendant maintains its principal
-# place of business and such litigation shall be governed by laws of that
-# jurisdiction, without reference to its conflict-of-law provisions.
-# Nothing in this Section shall prevent a party's ability to bring
-# cross-claims or counter-claims.
-# 
-# 9. Miscellaneous
-# ----------------
-# 
-# This License represents the complete agreement concerning the subject
-# matter hereof. If any provision of this License is held to be
-# unenforceable, such provision shall be reformed only to the extent
-# necessary to make it enforceable. Any law or regulation which provides
-# that the language of a contract shall be construed against the drafter
-# shall not be used to construe this License against a Contributor.
-# 
-# 10. Versions of the License
-# ---------------------------
-# 
-# 10.1. New Versions
-# 
-# Mozilla Foundation is the license steward. Except as provided in Section
-# 10.3, no one other than the license steward has the right to modify or
-# publish new versions of this License. Each version will be given a
-# distinguishing version number.
-# 
-# 10.2. Effect of New Versions
-# 
-# You may distribute the Covered Software under the terms of the version
-# of the License under which You originally received the Covered Software,
-# or under the terms of any subsequent version published by the license
-# steward.
-# 
-# 10.3. Modified Versions
-# 
-# If you create software not governed by this License, and you want to
-# create a new license for such software, you may create and use a
-# modified version of this License if you rename the license and remove
-# any references to the name of the license steward (except to note that
-# such modified license differs from this License).
-# 
-# 10.4. Distributing Source Code Form that is Incompatible With Secondary
-# Licenses
-# 
-# If You choose to distribute Source Code Form that is Incompatible With
-# Secondary Licenses under the terms of this version of the License, the
-# notice described in Exhibit B of this License must be attached.
-# 
-# Exhibit A - Source Code Form License Notice
-# -------------------------------------------
-# 
-#   This Source Code Form is subject to the terms of the Mozilla Public
-#   License, v. 2.0. If a copy of the MPL was not distributed with this
-#   file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# 
-# If it is not possible or desirable to put the notice in a particular
-# file, then You may include the notice in a location (such as a LICENSE
-# file in a relevant directory) where a recipient would be likely to look
-# for such a notice.
-# 
-# You may add additional accurate notices of copyright ownership.
-# 
-# Exhibit B - "Incompatible With Secondary Licenses" Notice
-# ---------------------------------------------------------
-# 
-#   This Source Code Form is "Incompatible With Secondary Licenses", as
-#   defined by the Mozilla Public License, v. 2.0.
-# 
-# Note on GPL Compatibility
-# -------------------------
-# 
-# The MPL 2, section 3.3, permits you to combine NSS with code under the GNU
-# General Public License (GPL) version 2, or any later version of that
-# license, to make a Larger Work, and distribute the result under the GPL.
-# The only condition is that you must also make NSS, and any changes you
-# have made to it, available to recipients under the terms of the MPL 2 also.
-# 
-# Anyone who receives the combined code from you does not have to continue
-# to dual licence in this way, and may, if they wish, distribute under the
-# terms of either of the two licences - either the MPL alone or the GPL
-# alone. However, we discourage people from distributing copies of NSS under
-# the GPL alone, because it means that any improvements they make cannot be
-# reincorporated into the main version of NSS. There is never a need to do
-# this for license compatibility reasons.
-# 
-# Note on LGPL Compatibility
-# --------------------------
-# 
-# The above also applies to combining MPLed code in a single library with
-# code under the GNU Lesser General Public License (LGPL) version 2.1, or
-# any later version of that license. If the LGPLed code and the MPLed code
-# are not in the same library, then the copyleft coverage of the two
-# licences does not overlap, so no issues arise.
-# 
-# 
-# Mozilla Public License Version 2.0
-# ==================================
-# 
-# 1. Definitions
-# --------------
-# 
-# 1.1. "Contributor"
-#     means each individual or legal entity that creates, contributes to
-#     the creation of, or owns Covered Software.
-# 
-# 1.2. "Contributor Version"
-#     means the combination of the Contributions of others (if any) used
-#     by a Contributor and that particular Contributor's Contribution.
-# 
-# 1.3. "Contribution"
-#     means Covered Software of a particular Contributor.
-# 
-# 1.4. "Covered Software"
-#     means Source Code Form to which the initial Contributor has attached
-#     the notice in Exhibit A, the Executable Form of such Source Code
-#     Form, and Modifications of such Source Code Form, in each case
-#     including portions thereof.
-# 
-# 1.5. "Incompatible With Secondary Licenses"
-#     means
-# 
-#     (a) that the initial Contributor has attached the notice described
-#         in Exhibit B to the Covered Software; or
-# 
-#     (b) that the Covered Software was made available under the terms of
-#         version 1.1 or earlier of the License, but not also under the
-#         terms of a Secondary License.
-# 
-# 1.6. "Executable Form"
-#     means any form of the work other than Source Code Form.
-# 
-# 1.7. "Larger Work"
-#     means a work that combines Covered Software with other material, in 
-#     a separate file or files, that is not Covered Software.
-# 
-# 1.8. "License"
-#     means this document.
-# 
-# 1.9. "Licensable"
-#     means having the right to grant, to the maximum extent possible,
-#     whether at the time of the initial grant or subsequently, any and
-#     all of the rights conveyed by this License.
-# 
-# 1.10. "Modifications"
-#     means any of the following:
-# 
-#     (a) any file in Source Code Form that results from an addition to,
-#         deletion from, or modification of the contents of Covered
-#         Software; or
-# 
-#     (b) any new file in Source Code Form that contains any Covered
-#         Software.
-# 
-# 1.11. "Patent Claims" of a Contributor
-#     means any patent claim(s), including without limitation, method,
-#     process, and apparatus claims, in any patent Licensable by such
-#     Contributor that would be infringed, but for the grant of the
-#     License, by the making, using, selling, offering for sale, having
-#     made, import, or transfer of either its Contributions or its
-#     Contributor Version.
-# 
-# 1.12. "Secondary License"
-#     means either the GNU General Public License, Version 2.0, the GNU
-#     Lesser General Public License, Version 2.1, the GNU Affero General
-#     Public License, Version 3.0, or any later versions of those
-#     licenses.
-# 
-# 1.13. "Source Code Form"
-#     means the form of the work preferred for making modifications.
-# 
-# 1.14. "You" (or "Your")
-#     means an individual or a legal entity exercising rights under this
-#     License. For legal entities, "You" includes any entity that
-#     controls, is controlled by, or is under common control with You. For
-#     purposes of this definition, "control" means (a) the power, direct
-#     or indirect, to cause the direction or management of such entity,
-#     whether by contract or otherwise, or (b) ownership of more than
-#     fifty percent (50%) of the outstanding shares or beneficial
-#     ownership of such entity.
-# 
-# 2. License Grants and Conditions
-# --------------------------------
-# 
-# 2.1. Grants
-# 
-# Each Contributor hereby grants You a world-wide, royalty-free,
-# non-exclusive license:
-# 
-# (a) under intellectual property rights (other than patent or trademark)
-#     Licensable by such Contributor to use, reproduce, make available,
-#     modify, display, perform, distribute, and otherwise exploit its
-#     Contributions, either on an unmodified basis, with Modifications, or
-#     as part of a Larger Work; and
-# 
-# (b) under Patent Claims of such Contributor to make, use, sell, offer
-#     for sale, have made, import, and otherwise transfer either its
-#     Contributions or its Contributor Version.
-# 
-# 2.2. Effective Date
-# 
-# The licenses granted in Section 2.1 with respect to any Contribution
-# become effective for each Contribution on the date the Contributor first
-# distributes such Contribution.
-# 
-# 2.3. Limitations on Grant Scope
-# 
-# The licenses granted in this Section 2 are the only rights granted under
-# this License. No additional rights or licenses will be implied from the
-# distribution or licensing of Covered Software under this License.
-# Notwithstanding Section 2.1(b) above, no patent license is granted by a
-# Contributor:
-# 
-# (a) for any code that a Contributor has removed from Covered Software;
-#     or
-# 
-# (b) for infringements caused by: (i) Your and any other third party's
-#     modifications of Covered Software, or (ii) the combination of its
-#     Contributions with other software (except as part of its Contributor
-#     Version); or
-# 
-# (c) under Patent Claims infringed by Covered Software in the absence of
-#     its Contributions.
-# 
-# This License does not grant any rights in the trademarks, service marks,
-# or logos of any Contributor (except as may be necessary to comply with
-# the notice requirements in Section 3.4).
-# 
-# 2.4. Subsequent Licenses
-# 
-# No Contributor makes additional grants as a result of Your choice to
-# distribute the Covered Software under a subsequent version of this
-# License (see Section 10.2) or under the terms of a Secondary License (if
-# permitted under the terms of Section 3.3).
-# 
-# 2.5. Representation
-# 
-# Each Contributor represents that the Contributor believes its
-# Contributions are its original creation(s) or it has sufficient rights
-# to grant the rights to its Contributions conveyed by this License.
-# 
-# 2.6. Fair Use
-# 
-# This License is not intended to limit any rights You have under
-# applicable copyright doctrines of fair use, fair dealing, or other
-# equivalents.
-# 
-# 2.7. Conditions
-# 
-# Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
-# in Section 2.1.
-# 
-# 3. Responsibilities
-# -------------------
-# 
-# 3.1. Distribution of Source Form
-# 
-# All distribution of Covered Software in Source Code Form, including any
-# Modifications that You create or to which You contribute, must be under
-# the terms of this License. You must inform recipients that the Source
-# Code Form of the Covered Software is governed by the terms of this
-# License, and how they can obtain a copy of this License. You may not
-# attempt to alter or restrict the recipients' rights in the Source Code
-# Form.
-# 
-# 3.2. Distribution of Executable Form
-# 
-# If You distribute Covered Software in Executable Form then:
-# 
-# (a) such Covered Software must also be made available in Source Code
-#     Form, as described in Section 3.1, and You must inform recipients of
-#     the Executable Form how they can obtain a copy of such Source Code
-#     Form by reasonable means in a timely manner, at a charge no more
-#     than the cost of distribution to the recipient; and
-# 
-# (b) You may distribute such Executable Form under the terms of this
-#     License, or sublicense it under different terms, provided that the
-#     license for the Executable Form does not attempt to limit or alter
-#     the recipients' rights in the Source Code Form under this License.
-# 
-# 3.3. Distribution of a Larger Work
-# 
-# You may create and distribute a Larger Work under terms of Your choice,
-# provided that You also comply with the requirements of this License for
-# the Covered Software. If the Larger Work is a combination of Covered
-# Software with a work governed by one or more Secondary Licenses, and the
-# Covered Software is not Incompatible With Secondary Licenses, this
-# License permits You to additionally distribute such Covered Software
-# under the terms of such Secondary License(s), so that the recipient of
-# the Larger Work may, at their option, further distribute the Covered
-# Software under the terms of either this License or such Secondary
-# License(s).
-# 
-# 3.4. Notices
-# 
-# You may not remove or alter the substance of any license notices
-# (including copyright notices, patent notices, disclaimers of warranty,
-# or limitations of liability) contained within the Source Code Form of
-# the Covered Software, except that You may alter any license notices to
-# the extent required to remedy known factual inaccuracies.
-# 
-# 3.5. Application of Additional Terms
-# 
-# You may choose to offer, and to charge a fee for, warranty, support,
-# indemnity or liability obligations to one or more recipients of Covered
-# Software. However, You may do so only on Your own behalf, and not on
-# behalf of any Contributor. You must make it absolutely clear that any
-# such warranty, support, indemnity, or liability obligation is offered by
-# You alone, and You hereby agree to indemnify every Contributor for any
-# liability incurred by such Contributor as a result of warranty, support,
-# indemnity or liability terms You offer. You may include additional
-# disclaimers of warranty and limitations of liability specific to any
-# jurisdiction.
-# 
-# 4. Inability to Comply Due to Statute or Regulation
-# ---------------------------------------------------
-# 
-# If it is impossible for You to comply with any of the terms of this
-# License with respect to some or all of the Covered Software due to
-# statute, judicial order, or regulation then You must: (a) comply with
-# the terms of this License to the maximum extent possible; and (b)
-# describe the limitations and the code they affect. Such description must
-# be placed in a text file included with all distributions of the Covered
-# Software under this License. Except to the extent prohibited by statute
-# or regulation, such description must be sufficiently detailed for a
-# recipient of ordinary skill to be able to understand it.
-# 
-# 5. Termination
-# --------------
-# 
-# 5.1. The rights granted under this License will terminate automatically
-# if You fail to comply with any of its terms. However, if You become
-# compliant, then the rights granted under this License from a particular
-# Contributor are reinstated (a) provisionally, unless and until such
-# Contributor explicitly and finally terminates Your grants, and (b) on an
-# ongoing basis, if such Contributor fails to notify You of the
-# non-compliance by some reasonable means prior to 60 days after You have
-# come back into compliance. Moreover, Your grants from a particular
-# Contributor are reinstated on an ongoing basis if such Contributor
-# notifies You of the non-compliance by some reasonable means, this is the
-# first time You have received notice of non-compliance with this License
-# from such Contributor, and You become compliant prior to 30 days after
-# Your receipt of the notice.
-# 
-# 5.2. If You initiate litigation against any entity by asserting a patent
-# infringement claim (excluding declaratory judgment actions,
-# counter-claims, and cross-claims) alleging that a Contributor Version
-# directly or indirectly infringes any patent, then the rights granted to
-# You by any and all Contributors for the Covered Software under Section
-# 2.1 of this License shall terminate.
-# 
-# 5.3. In the event of termination under Sections 5.1 or 5.2 above, all
-# end user license agreements (excluding distributors and resellers) which
-# have been validly granted by You or Your distributors under this License
-# prior to termination shall survive termination.
-# 
-# ************************************************************************
-# *                                                                      *
-# *  6. Disclaimer of Warranty                                           *
-# *  -------------------------                                           *
-# *                                                                      *
-# *  Covered Software is provided under this License on an "as is"       *
-# *  basis, without warranty of any kind, either expressed, implied, or  *
-# *  statutory, including, without limitation, warranties that the       *
-# *  Covered Software is free of defects, merchantable, fit for a        *
-# *  particular purpose or non-infringing. The entire risk as to the     *
-# *  quality and performance of the Covered Software is with You.        *
-# *  Should any Covered Software prove defective in any respect, You     *
-# *  (not any Contributor) assume the cost of any necessary servicing,   *
-# *  repair, or correction. This disclaimer of warranty constitutes an   *
-# *  essential part of this License. No use of any Covered Software is   *
-# *  authorized under this License except under this disclaimer.         *
-# *                                                                      *
-# ************************************************************************
-# 
-# ************************************************************************
-# *                                                                      *
-# *  7. Limitation of Liability                                          *
-# *  --------------------------                                          *
-# *                                                                      *
-# *  Under no circumstances and under no legal theory, whether tort      *
-# *  (including negligence), contract, or otherwise, shall any           *
-# *  Contributor, or anyone who distributes Covered Software as          *
-# *  permitted above, be liable to You for any direct, indirect,         *
-# *  special, incidental, or consequential damages of any character      *
-# *  including, without limitation, damages for lost profits, loss of    *
-# *  goodwill, work stoppage, computer failure or malfunction, or any    *
-# *  and all other commercial damages or losses, even if such party      *
-# *  shall have been informed of the possibility of such damages. This   *
-# *  limitation of liability shall not apply to liability for death or   *
-# *  personal injury resulting from such party's negligence to the       *
-# *  extent applicable law prohibits such limitation. Some               *
-# *  jurisdictions do not allow the exclusion or limitation of           *
-# *  incidental or consequential damages, so this exclusion and          *
-# *  limitation may not apply to You.                                    *
-# *                                                                      *
-# ************************************************************************
-# 
-# 8. Litigation
-# -------------
-# 
-# Any litigation relating to this License may be brought only in the
-# courts of a jurisdiction where the defendant maintains its principal
-# place of business and such litigation shall be governed by laws of that
-# jurisdiction, without reference to its conflict-of-law provisions.
-# Nothing in this Section shall prevent a party's ability to bring
-# cross-claims or counter-claims.
-# 
-# 9. Miscellaneous
-# ----------------
-# 
-# This License represents the complete agreement concerning the subject
-# matter hereof. If any provision of this License is held to be
-# unenforceable, such provision shall be reformed only to the extent
-# necessary to make it enforceable. Any law or regulation which provides
-# that the language of a contract shall be construed against the drafter
-# shall not be used to construe this License against a Contributor.
-# 
-# 10. Versions of the License
-# ---------------------------
-# 
-# 10.1. New Versions
-# 
-# Mozilla Foundation is the license steward. Except as provided in Section
-# 10.3, no one other than the license steward has the right to modify or
-# publish new versions of this License. Each version will be given a
-# distinguishing version number.
-# 
-# 10.2. Effect of New Versions
-# 
-# You may distribute the Covered Software under the terms of the version
-# of the License under which You originally received the Covered Software,
-# or under the terms of any subsequent version published by the license
-# steward.
-# 
-# 10.3. Modified Versions
-# 
-# If you create software not governed by this License, and you want to
-# create a new license for such software, you may create and use a
-# modified version of this License if you rename the license and remove
-# any references to the name of the license steward (except to note that
-# such modified license differs from this License).
-# 
-# 10.4. Distributing Source Code Form that is Incompatible With Secondary
-# Licenses
-# 
-# If You choose to distribute Source Code Form that is Incompatible With
-# Secondary Licenses under the terms of this version of the License, the
-# notice described in Exhibit B of this License must be attached.
-# 
-# Exhibit A - Source Code Form License Notice
-# -------------------------------------------
-# 
-#   This Source Code Form is subject to the terms of the Mozilla Public
-#   License, v. 2.0. If a copy of the MPL was not distributed with this
-#   file, You can obtain one at http://mozilla.org/MPL/2.0/.
-# 
-# If it is not possible or desirable to put the notice in a particular
-# file, then You may include the notice in a location (such as a LICENSE
-# file in a relevant directory) where a recipient would be likely to look
-# for such a notice.
-# 
-# You may add additional accurate notices of copyright ownership.
-# 
-# Exhibit B - "Incompatible With Secondary Licenses" Notice
-# ---------------------------------------------------------
-# 
-#   This Source Code Form is "Incompatible With Secondary Licenses", as
-#   defined by the Mozilla Public License, v. 2.0.
-# 

debian/files

@@ -1,2 +0,0 @@
-i2p-firefox-profile_1.05.0-1_all.deb net optional
-i2p-firefox-profile_1.05.0-1_amd64.buildinfo net optional

debian/i2p-firefox-profile-docs.docs

@@ -1,2 +0,0 @@
-README.source
-README.Debian

debian/install

@@ -1,10 +0,0 @@
-src/unix/i2pbrowserrc /etc/i2pbrowser/i2pbrowserrc
-src/unix/i2pbrowserdebianrc /etc/i2pbrowser/i2pbrowserdebianrc
-src/unix/i2pbrowser.sh /usr/bin/
-src/unix/i2pconfig.sh /usr/bin/
-src/unix/i2p-config-service-setup.sh /usr/bin/
-src/profile /var/lib/i2pbrowser/profile
-src/app-profile /var/lib/i2pbrowser/app-profile
-src/icons /var/lib/i2pbrowser/icons
-src/unix/desktop/i2pbrowser-debian.desktop /usr/share/applications/
-src/unix/desktop/i2pconfig-debian.desktop /usr/share/applications/

debian/rules

@@ -1,24 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#export DH_VERBOSE = 1
-
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-
-%:
-	dh $@
-
-override_dh_auto_build:
-	@echo "no need to do the windows build"
-
-override_dh_auto_install: debian/install
-	@echo "use debian/install"

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

description-pak

@@ -1 +0,0 @@
-A browser profile and accompanying script for launching it. Used to combine I2P with Firefox in a reasonably safe way.

docs/GOALS.html

@@ -0,0 +1,553 @@
+<html>
+  <head>
+    <title>
+      I2P Easy-Install...
+    </title>
+    <meta name="author" content="eyedeekay" />
+    <meta name="description" content="i2p.firefox" />
+    <meta name="keywords" content="master" />
+    <link rel="stylesheet" type="text/css" href="style.css" />
+    <link rel="stylesheet" type="text/css" href="showhider.css" />
+    <link rel="stylesheet" type="text/css" href="darklight.css" />
+  </head>
+  <body>
+    <input type="checkbox" id="checkboxDarkLight">
+    <div class="container">
+      <div id="navbar">
+        <a href="#shownav">
+          Show navigation
+        </a>
+        <div id="shownav">
+          <div id="hidenav">
+            <ul>
+              <li>
+                <a href="..">
+                  Up one level ^
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index
+                </a>
+              </li>
+              <li>
+                <a href="LICENSE.html">
+                  LICENSE
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index.html
+                </a>
+              </li>
+              <li>
+                <a href="GOALS.html">
+                  GOALS
+                </a>
+              </li>
+              <li>
+                <a href="PRINCIPLES.html">
+                  PRINCIPLES
+                </a>
+              </li>
+              <li>
+                <a href="RELEASE.html">
+                  RELEASE
+                </a>
+              </li>
+              <li>
+                <a href="UPDATES.html">
+                  UPDATES
+                </a>
+              </li>
+            </ul>
+            <br>
+            <a href="#hidenav">
+              Hide Navigation
+            </a>
+          </div>
+        </div>
+      </div>
+      <a id="returnhome" href="/">
+        /
+      </a>
+      <h1>
+        Feature Goals
+      </h1>
+      <p>
+        For information about the &ldquo;Goals guiding the Goals&rdquo; see:
+        <code>
+          [PRINCIPLES]
+        </code>
+        .
+      </p>
+      <p>
+        While Windows is the primary platform, some goals may represent cross-platform
+        utility as well. Since a portable jpackage really only needs slightly different
+        arguments on different platforms, cross-platform support is often low-cost.
+      </p>
+      <ul>
+        <li>
+          <strong>
+            See Also:
+          </strong>
+        </li>
+        <li>
+          <em>
+            Browser Integrations are provided by browser extensions which are contained in their own repositories.
+          </em>
+        </li>
+        <li>
+          Firefox:
+        </li>
+        <li>
+          <a href="http://git.idk.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox/">
+            git.idk.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox
+          </a>
+        </li>
+        <li>
+          <a href="https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox/">
+            i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox
+          </a>
+        </li>
+        <li>
+          <a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/">
+            github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox
+          </a>
+        </li>
+        <li>
+          Chromium:
+        </li>
+        <li>
+          <a href="http://git.idk.i2p/idk/I2P-Configuration-For-Chromium/">
+            git.idk.i2p/idk/I2P-Configuration-For-Chromium
+          </a>
+        </li>
+        <li>
+          <a href="https://i2pgit.org/idk/I2P-Configuration-For-Chromium/">
+            i2pgit.org/idk/I2P-Configuration-For-Chromium
+          </a>
+        </li>
+        <li>
+          <a href="https://github.com/eyedeekay/I2P-Configuration-For-Chromium/">
+            github.com/eyedeekay/I2P-Configuration-For-Chromium
+          </a>
+        </li>
+        <li>
+          <em>
+            Browser profile management are provided by a freestanding, cross-platform library which is contained in its own repository.
+          </em>
+        </li>
+        <li>
+          <a href="http://git.idk.i2p/idk/i2p.plugins.firefox">
+            git.idk.i2p/idk/i2p.plugins.firefox
+          </a>
+        </li>
+        <li>
+          <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
+            i2pgit.org/idk/i2p.plugins.firefox
+          </a>
+        </li>
+        <li>
+          <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+            github.com/eyedeekay/i2p.plugins.firefox
+          </a>
+        </li>
+      </ul>
+      <h2>
+        Build Methods
+      </h2>
+      <ul>
+        <li>
+          <code>
+            [X]
+          </code>
+          Cleanly separate jpackage generation phase from NSIS generation phase
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Enable archive builds for generating Windows
+          <code>
+            .exe
+          </code>
+          &rsquo;s from Linux hosts
+        </li>
+      </ul>
+      <h2>
+        Installation Methods
+      </h2>
+      <ul>
+        <li>
+          <code>
+            [X]
+          </code>
+          NSIS installer
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Portable, directory-based install
+        </li>
+        <li>
+          <code>
+            [ ]
+          </code>
+          Windows Service Support
+        </li>
+      </ul>
+      <h2>
+        Update Methods
+      </h2>
+      <ul>
+        <li>
+          <code>
+            [X]
+          </code>
+          NSIS installer in Default Directory
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          NSIS installer in Portable Directory
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Handle admin and non-admin updates automatically
+        </li>
+        <li>
+          <code>
+            [ ]
+          </code>
+          Zip-Only portable updater
+        </li>
+      </ul>
+      <h2>
+        Launcher
+      </h2>
+      <ul>
+        <li>
+          <code>
+            [X]
+          </code>
+          Detect and handle un-bundled routers on the host system, policy of non-interference
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Wait for router console to be ready to launch router-console browser
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Wait for proxy to be ready to launch I2P Web Browser
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Launch browser instead of router when a repeat-launch is detected
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          GUI component for launching each available component
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Introduce
+          <code>
+            browser.properties
+          </code>
+          for customization
+        </li>
+        <li>
+          <code>
+            [ ]
+          </code>
+          Registry-based browser discovery
+          <a href="http://git.idk.i2p/idk/i2p.plugins.firefox/-/issues/3">
+            Firefox
+          </a>
+          <a href="http://git.idk.i2p/idk/i2p.plugins.firefox/-/issues/4">
+            Chromium
+          </a>
+        </li>
+      </ul>
+      <h2>
+        Browser Configuration All
+      </h2>
+      <ul>
+        <li>
+          <code>
+            [X]
+          </code>
+          Use identical extensions in Firefox-based and Chromium-based browsers wherever possible
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Always use a dedicated, I2P Easy-Install specific profile directory
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Always configure an HTTP Proxy, and safe access to the router console
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Provide I2P-Specific integrations to the browser UI through WebExtensions
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Operate in &ldquo;Strict&rdquo; mode where the maximum level of defenses are up
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Operate in &ldquo;Usability&rdquo; mode where defense is balanced with utility
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Operate in &ldquo;App&rdquo; mode where we work as a single-purpose window where it is hard to access arbitrary, potentially malicious resources
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          All I2P-Specific profiles should be possible to generate automatically, sight-unseen
+        </li>
+      </ul>
+      <h2>
+        Browser Configuration Firefox
+      </h2>
+      <ul>
+        <li>
+          <code>
+            [X]
+          </code>
+          When using Firefox, download extension updates automatically, from AMO, using an outproxy
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Integrate I2P in Private Browsing for to provide UI for I2P within Firefox
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Prevent WebRTC proxy escapes by setting mode
+          <code>
+            4
+          </code>
+          <code>
+            disable_non_proxied_udp
+          </code>
+          or higher
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Customize panel for Firefox
+          <code>
+            App
+          </code>
+          mode(Not required for Chromiums)
+        </li>
+      </ul>
+      <h2>
+        Browser Configuration Chromium
+      </h2>
+      <ul>
+        <li>
+          <code>
+            [X]
+          </code>
+          When using Chromium, load extensions from source and freeze them without updates to prevent unproxied updating.
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Integrate
+          <code>
+            I2PChrome.js
+          </code>
+          to provide UI for I2P within Chrome
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Prevent WebRTC proxy escapes by setting mode
+          <code>
+            4
+          </code>
+          <code>
+            disable_non_proxied_udp
+          </code>
+        </li>
+      </ul>
+      <h2>
+        Browser Configuration Strict Mode
+      </h2>
+      <ul>
+        <li>
+          <code>
+            [X]
+          </code>
+          Disable Javascript by default with NoScript
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Enforce HTTPS where available with HTTPS Everywhere
+          <strong>
+            OR
+          </strong>
+          HTTPS only Mode
+        </li>
+        <li>
+          <code>
+            [ ]
+          </code>
+          Proactively enumerate and disable &ldquo;Fine&rdquo; fingerprinting vectors where possible(ongoing)
+        </li>
+        <li>
+          <code>
+            [ ]
+          </code>
+          When running in Tor Browser, look as much like Tor Browser as possible but use an outproxy(ongoing)
+        </li>
+      </ul>
+      <h2>
+        Browser Configuration Usability Mode
+      </h2>
+      <ul>
+        <li>
+          <code>
+            [X]
+          </code>
+          Enable Javascript by default but limit it with jShelter
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Enforce HTTPS where available with HTTPS Everywhere
+          <strong>
+            OR
+          </strong>
+          HTTPS only Mode
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Limit attempts to fetch useless junk like advertising with an up-to-date uBlock Origin
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Limit attempts to reach clearnet CDN&rsquo;s with LocalCDN
+        </li>
+        <li>
+          <code>
+            [X]
+          </code>
+          Isolate
+          <code>
+            .onion
+          </code>
+          traffic from
+          <code>
+            outproxy
+          </code>
+          traffic and
+          <code>
+            .i2p
+          </code>
+          traffic using Onion in Container Tabs
+        </li>
+      </ul>
+      <div id="sourcecode">
+        <span id="sourcehead">
+          <strong>
+            Get the source code:
+          </strong>
+        </span>
+        <ul>
+          <li>
+            <a href="https://github.com/eyedeekay/i2p.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.firefox)
+            </a>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <a href="#show">
+          Show license
+        </a>
+        <div id="show">
+          <div id="hide">
+            <pre><code>Copyright 2018
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+</code></pre>
+            <a href="#hide">
+              Hide license
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe>
+    </div>
+    <div>
+      <a href="https://geti2p.net/">
+        <img class="i2plogo" src="i2plogo.png"></img>
+        I2P
+      </a>
+    </div>
+  </body>
+</html>

docs/GOALS.md

@@ -0,0 +1,99 @@
+Feature Goals
+=============
+
+For information about the "Goals guiding the Goals" see: `[PRINCIPLES]`.
+
+While Windows is the primary platform, some goals may represent cross-platform
+utility as well. Since a portable jpackage really only needs slightly different
+arguments on different platforms, cross-platform support is often low-cost.
+
+- **See Also:**
+- *Browser Integrations are provided by browser extensions which are contained in their own repositories.*
+- Firefox:
+- [git.idk.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox](http://git.idk.i2p/idk/I2P-in-Private-Browsing-Mode-Firefox/)
+- [i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox](https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox/)
+- [github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox](https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox/)
+- Chromium:
+- [git.idk.i2p/idk/I2P-Configuration-For-Chromium](http://git.idk.i2p/idk/I2P-Configuration-For-Chromium/)
+- [i2pgit.org/idk/I2P-Configuration-For-Chromium](https://i2pgit.org/idk/I2P-Configuration-For-Chromium/)
+- [github.com/eyedeekay/I2P-Configuration-For-Chromium](https://github.com/eyedeekay/I2P-Configuration-For-Chromium/)
+- *Browser profile management are provided by a freestanding, cross-platform library which is contained in its own repository.*
+- [git.idk.i2p/idk/i2p.plugins.firefox](http://git.idk.i2p/idk/i2p.plugins.firefox)
+- [i2pgit.org/idk/i2p.plugins.firefox](https://i2pgit.org/idk/i2p.plugins.firefox)
+- [github.com/eyedeekay/i2p.plugins.firefox](https://github.com/eyedeekay/i2p.plugins.firefox)
+
+Build Methods
+-------------
+
+- `[X]` Cleanly separate jpackage generation phase from NSIS generation phase
+- `[X]` Enable archive builds for generating Windows `.exe`'s from Linux hosts
+
+Installation Methods
+--------------------
+
+- `[X]` NSIS installer
+- `[X]` Portable, directory-based install
+- `[ ]` Windows Service Support
+
+Update Methods
+--------------
+
+- `[X]` NSIS installer in Default Directory
+- `[X]` NSIS installer in Portable Directory
+- `[X]` Handle admin and non-admin updates automatically
+- `[ ]` Zip-Only portable updater
+
+Launcher
+--------
+
+- `[X]` Detect and handle un-bundled routers on the host system, policy of non-interference
+- `[X]` Wait for router console to be ready to launch router-console browser
+- `[X]` Wait for proxy to be ready to launch I2P Web Browser
+- `[X]` Launch browser instead of router when a repeat-launch is detected
+- `[X]` GUI component for launching each available component
+- `[X]` Introduce `browser.properties` for customization
+- `[ ]` Registry-based browser discovery [Firefox](http://git.idk.i2p/idk/i2p.plugins.firefox/-/issues/3) [Chromium](http://git.idk.i2p/idk/i2p.plugins.firefox/-/issues/4)
+
+Browser Configuration All
+-------------------------
+
+- `[X]` Use identical extensions in Firefox-based and Chromium-based browsers wherever possible
+- `[X]` Always use a dedicated, I2P Easy-Install specific profile directory
+- `[X]` Always configure an HTTP Proxy, and safe access to the router console
+- `[X]` Provide I2P-Specific integrations to the browser UI through WebExtensions
+- `[X]` Operate in "Strict" mode where the maximum level of defenses are up
+- `[X]` Operate in "Usability" mode where defense is balanced with utility
+- `[X]` Operate in "App" mode where we work as a single-purpose window where it is hard to access arbitrary, potentially malicious resources
+- `[X]` All I2P-Specific profiles should be possible to generate automatically, sight-unseen
+
+Browser Configuration Firefox
+-----------------------------
+
+- `[X]` When using Firefox, download extension updates automatically, from AMO, using an outproxy
+- `[X]` Integrate I2P in Private Browsing for to provide UI for I2P within Firefox
+- `[X]` Prevent WebRTC proxy escapes by setting mode `4` `disable_non_proxied_udp` or higher
+- `[X]` Customize panel for Firefox `App` mode(Not required for Chromiums)
+
+Browser Configuration Chromium
+------------------------------
+
+- `[X]` When using Chromium, load extensions from source and freeze them without updates to prevent unproxied updating.
+- `[X]` Integrate `I2PChrome.js` to provide UI for I2P within Chrome
+- `[X]` Prevent WebRTC proxy escapes by setting mode `4` `disable_non_proxied_udp`
+
+Browser Configuration Strict Mode
+---------------------------------
+
+- `[X]` Disable Javascript by default with NoScript
+- `[X]` Enforce HTTPS where available with HTTPS Everywhere **OR** HTTPS only Mode
+- `[ ]` Proactively enumerate and disable "Fine" fingerprinting vectors where possible(ongoing)
+- `[ ]` When running in Tor Browser, look as much like Tor Browser as possible but use an outproxy(ongoing)
+
+Browser Configuration Usability Mode
+------------------------------------
+
+- `[X]` Enable Javascript by default but limit it with jShelter
+- `[X]` Enforce HTTPS where available with HTTPS Everywhere **OR** HTTPS only Mode
+- `[X]` Limit attempts to fetch useless junk like advertising with an up-to-date uBlock Origin
+- `[X]` Limit attempts to reach clearnet CDN's with LocalCDN
+- `[X]` Isolate `.onion` traffic from `outproxy` traffic and `.i2p` traffic using Onion in Container Tabs

docs/PRINCIPLES.html

@@ -0,0 +1,377 @@
+<html>
+  <head>
+    <title>
+      I2P Easy-Install...
+    </title>
+    <meta name="author" content="eyedeekay" />
+    <meta name="description" content="i2p.firefox" />
+    <meta name="keywords" content="master" />
+    <link rel="stylesheet" type="text/css" href="style.css" />
+    <link rel="stylesheet" type="text/css" href="showhider.css" />
+    <link rel="stylesheet" type="text/css" href="darklight.css" />
+  </head>
+  <body>
+    <input type="checkbox" id="checkboxDarkLight">
+    <div class="container">
+      <div id="navbar">
+        <a href="#shownav">
+          Show navigation
+        </a>
+        <div id="shownav">
+          <div id="hidenav">
+            <ul>
+              <li>
+                <a href="..">
+                  Up one level ^
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index
+                </a>
+              </li>
+              <li>
+                <a href="LICENSE.html">
+                  LICENSE
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index.html
+                </a>
+              </li>
+              <li>
+                <a href="GOALS.html">
+                  GOALS
+                </a>
+              </li>
+              <li>
+                <a href="PRINCIPLES.html">
+                  PRINCIPLES
+                </a>
+              </li>
+              <li>
+                <a href="RELEASE.html">
+                  RELEASE
+                </a>
+              </li>
+              <li>
+                <a href="UPDATES.html">
+                  UPDATES
+                </a>
+              </li>
+            </ul>
+            <br>
+            <a href="#hidenav">
+              Hide Navigation
+            </a>
+          </div>
+        </div>
+      </div>
+      <a id="returnhome" href="/">
+        /
+      </a>
+      <h1>
+        Guidance
+      </h1>
+      <p>
+        This document explains the ideas which are guiding the development of
+        features specific to the I2P Easy-Install bundle.
+      </p>
+      <p>
+        The general idea is that it is possible, on most platforms, to make I2P
+        post-install configuration much simpler and much less error-prone. Each
+        section of this document has guidance for a different &ldquo;Meta-Feature&rdquo; of
+        the I2P Easy-Install Bundle. For granular, specific information about
+        goals both achieved and un-achieved see
+        <code>
+          [GOALS]
+        </code>
+        .
+      </p>
+      <ul>
+        <li>
+          <strong>
+            Sections:
+          </strong>
+        </li>
+      </ul>
+      <ol>
+        <li>
+          Guidance for Browser Profile Configuration
+        </li>
+      </ol>
+      <h2>
+        Guidance for Browser Profile Configuration
+      </h2>
+      <ul>
+        <li>
+          <strong>
+            See also:
+          </strong>
+        </li>
+        <li>
+          <a href="http://git.idk.i2p/idk/i2p.plugins.firefox">
+            git.idk.i2p/idk/i2p.plugins.firefox
+          </a>
+        </li>
+        <li>
+          <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
+            i2pgit.org/idk/i2p.plugins.firefox
+          </a>
+        </li>
+        <li>
+          <a href="https://github.com/eyedeekay/i2p.plugins.firefox">
+            github.com/eyedeekay/i2p.plugins.firefox
+          </a>
+        </li>
+      </ul>
+      <p>
+        The I2P Easy-Install Bundle for Windows considers basic configuration tasks
+        &ldquo;Features&rdquo; when they can be automated. The quintessential example of this
+        is
+        <strong>
+          <code>
+            Browser Profile Configuration
+          </code>
+        </strong>
+        where it injects settings into a
+        pre-existing browser from the host system. Solving this problem pre-dates
+        the evolution of
+        <code>
+          i2p.firefox
+        </code>
+        into a fully-fledged I2P router distribution
+        and has been the defining goal of this project for its entire existence.
+      </p>
+      <p>
+        However, what good browser profile configuration is, is as complicated as
+        how to deploy it. I2P has a unique opportunity to decide how it will handle
+        problems related to browsing in its own context while the network grows
+        and synthesize a useful number of safe browser configurations while also
+        reducing existing browser config fragmentation.
+      </p>
+      <p>
+        Easy-Install attempts to limit the number of &ldquo;Coarse Fingerprints&rdquo; which it will
+        produce by default to a predictable number. A Coarse Fingerprint is basically
+        a fingerprint &ldquo;That we know we&rsquo;re making&rdquo; by offering the ability to configure
+        something differently.
+      </p>
+      <ul>
+        <li>
+          <strong>
+            That means:
+          </strong>
+        </li>
+      </ul>
+      <ol>
+        <li>
+          It considers the browser integral to the interactive use of the I2P network by a large fraction of users.
+        </li>
+        <li>
+          It considers effective browser configuration
+          <strong>
+            impossible for a single user to achieve
+          </strong>
+          because effective browser configuration must have the characteristic of being reflected en-masse(anti-fingerprinting measures are only remotely effective when widely used).
+        </li>
+        <li>
+          The browser profile it injects inherits the runtime security characteristics of the
+          <strong>
+            host browser
+          </strong>
+          .
+        </li>
+        <li>
+          The browser profile it injects obtains runtime privacy characteristics of the
+          <strong>
+            easy-install bundle
+          </strong>
+        </li>
+        <li>
+          The number of coarse browser fingerprint sets is reduced from indeterminately large to
+          <code>
+            [supported browsers]*[variant configurations]
+          </code>
+        </li>
+        <li>
+          It attempts to balance flexibility with privacy, and accommodate people&rsquo;s preferences where possible.
+        </li>
+        <li>
+          It considers browser vendors better at providing browser updates than the I2P Project
+        </li>
+      </ol>
+      <h2>
+        Browser Configurations and Coarse Fingerprints
+      </h2>
+      <p>
+        At this time it offers configuration for Tor Browser, Firefox, Waterfox, and
+        LibreWolf for Firefox-based browsers, and Ungoogled-Chromium, Chromium, Brave,
+        Chrome, and Edgium configuration for Chromium-based browsers. That is a total
+        of
+        <strong>
+          Nine(9)
+        </strong>
+        main browsers. There are
+        <strong>
+          Two(2)
+        </strong>
+        variant configurations,
+        which correspond to &ldquo;Strict&rdquo; and &ldquo;Usability&rdquo; Modes. That makes a total of
+        <strong>
+          Eighteen(18)
+        </strong>
+        coarse browser fingerprints produced by this bundle. It also
+        has the ability to launch in a &ldquo;Restricted to Apps&rdquo; mode where it is only
+        possible to visit I2P sites using links on the I2P application interface(router
+        console, hidden services manager) itself.
+      </p>
+      <h3>
+        Strict Mode
+      </h3>
+      <p>
+        This is not on its face as good as having an almost entirely unified browser
+        fingerprint like Tor Browser attempts to have. It is a simple fact that 18
+        is greater than one. Every active attempt to gain granularity from a browser
+        outside of off-the-shelf Fingerprinting techniques is classified as &ldquo;Fine&rdquo;
+        fingerprinting. It is unpredictable, and harder to defend against, more likely
+        to exhibit novelty, and more likely to be affected by the host browser&rsquo;s
+        security. When fingerprinters get this creative disabling Javascript by default
+        is the most complete defense. This is the primary characteristic of Strict Mode,
+        it disables Javascript by default with NoScript.
+        <strong>
+          Strict Mode is the only
+        </strong>
+        <strong>
+          partial defense against fine-fingerprinting offered by this product.
+        </strong>
+        Even
+        disabling Javascript does not close all fine fingerprinting vectors, but it
+        does close most of them and reduce attack surface significantly. It is recommended
+        in combination with Tor Browser, and attempts to be somewhat closer to Tor Browser
+        than Usability Mode. It is the default mode of operation.
+      </p>
+      <h3>
+        Usability Mode
+      </h3>
+      <p>
+        In contrast to Strict Mode, Usability mode offers the greatest agreeable number
+        of browser features enabled by default, including a restricted subset of Javascript.
+        It makes no attempt at all to look like Tor Browser, even when using Tor Browser
+        as a host browser. It does attempt to optimize the browser for use within I2P, including
+        specific optimizations to keep traffic in-network or even retrieve information which is
+        stored on the localhost(while avoiding cache timing attacks). It does this by deploying
+        an alternative loadout of extensions, including ones which block advertising by default
+        and which include a cache of CDN resources in local browser storage.
+      </p>
+      <h3>
+        Firefox-Based Browsers
+      </h3>
+      <p>
+        Because of the relatively high configurability of Firefox-based browser
+        telemetry, Firefox-based browsers are preferred over Chromium-based browsers.
+        Chromium-based browsers will be used by default
+        <strong>
+          only
+        </strong>
+        if a Firefox based
+        browser is unavailable. Only Firefox-variant releases of the Extended Support
+        Release or of the latest stable release are supportable. If a variant lags
+        behind Firefox releases, it will be dropped. The primary reason for the default
+        &ldquo;Ordering&rdquo; of Firefox Profile Selection is the speed at which updates can be
+        expected to be applied.
+      </p>
+      <h3>
+        Chromium-Based Browsers
+      </h3>
+      <p>
+        Chromium-based browser selection is more subjective and slightly more ad-hoc.
+        Chromium browsers are chosen based on the variant&rsquo;s stated goals and perceived
+        efficacy in pursuing those goals. For example, if a Chromium distribution is
+        focused on removing telemetry or providing anti-fingerprinting, it is chosen
+        before a Chromium that is provided by Google or integrated tightly with the
+        host OS. This is a matter of judgement on my part and if you disagree you should
+        open an issue and argue with me. I&rsquo;m not infallible, I&rsquo;ll listen.
+      </p>
+      <h3>
+        All other browsers
+      </h3>
+      <p>
+        With all other browsers attempts at anti-fingerprinting are a moot point. It offers
+        limited configuration options using widely-supported generic browser configuration
+        means. If it doesn&rsquo;t recognize a Firefox or Chromium browser on the host, then it
+        sets the common proxy environment variables
+        <code>
+          http_proxy
+        </code>
+        <code>
+          https_proxy
+        </code>
+        <code>
+          ALL_PROXY
+        </code>
+        and
+        <code>
+          NO_PROXY
+        </code>
+        to their appropriate values before launching the browser configuration
+        and attempts to set a directory for the runtime configuration(Profile) by changing
+        to the profile directory.
+      </p>
+      <div id="sourcecode">
+        <span id="sourcehead">
+          <strong>
+            Get the source code:
+          </strong>
+        </span>
+        <ul>
+          <li>
+            <a href="https://github.com/eyedeekay/i2p.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.firefox)
+            </a>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <a href="#show">
+          Show license
+        </a>
+        <div id="show">
+          <div id="hide">
+            <pre><code>Copyright 2018
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+</code></pre>
+            <a href="#hide">
+              Hide license
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe>
+    </div>
+    <div>
+      <a href="https://geti2p.net/">
+        <img class="i2plogo" src="i2plogo.png"></img>
+        I2P
+      </a>
+    </div>
+  </body>
+</html>

docs/PRINCIPLES.md

@@ -0,0 +1,123 @@
+Guidance
+========
+
+This document explains the ideas which are guiding the development of
+features specific to the I2P Easy-Install bundle.
+
+The general idea is that it is possible, on most platforms, to make I2P
+post-install configuration much simpler and much less error-prone. Each
+section of this document has guidance for a different "Meta-Feature" of
+the I2P Easy-Install Bundle. For granular, specific information about
+goals both achieved and un-achieved see `[GOALS]`.
+
+- **Sections:**
+
+1. Guidance for Browser Profile Configuration
+
+Guidance for Browser Profile Configuration
+------------------------------------------
+
+- **See also:**
+- [git.idk.i2p/idk/i2p.plugins.firefox](http://git.idk.i2p/idk/i2p.plugins.firefox)
+- [i2pgit.org/idk/i2p.plugins.firefox](https://i2pgit.org/idk/i2p.plugins.firefox)
+- [github.com/eyedeekay/i2p.plugins.firefox](https://github.com/eyedeekay/i2p.plugins.firefox)
+
+The I2P Easy-Install Bundle for Windows considers basic configuration tasks
+"Features" when they can be automated. The quintessential example of this
+is **``Browser Profile Configuration``** where it injects settings into a
+pre-existing browser from the host system. Solving this problem pre-dates
+the evolution of `i2p.firefox` into a fully-fledged I2P router distribution
+and has been the defining goal of this project for its entire existence.
+
+However, what good browser profile configuration is, is as complicated as
+how to deploy it. I2P has a unique opportunity to decide how it will handle
+problems related to browsing in its own context while the network grows
+and synthesize a useful number of safe browser configurations while also
+reducing existing browser config fragmentation.
+
+Easy-Install attempts to limit the number of "Coarse Fingerprints" which it will
+produce by default to a predictable number. A Coarse Fingerprint is basically
+a fingerprint "That we know we're making" by offering the ability to configure
+something differently.
+
+- **That means:**
+
+1. It considers the browser integral to the interactive use of the I2P network by a large fraction of users.
+2. It considers effective browser configuration **impossible for a single user to achieve** because effective browser configuration must have the characteristic of being reflected en-masse(anti-fingerprinting measures are only remotely effective when widely used).
+3. The browser profile it injects inherits the runtime security characteristics of the **host browser**.
+4. The browser profile it injects obtains runtime privacy characteristics of the **easy-install bundle**
+5. The number of coarse browser fingerprint sets is reduced from indeterminately large to `[supported browsers]*[variant configurations]`
+6. It attempts to balance flexibility with privacy, and accommodate people's preferences where possible.
+7. It considers browser vendors better at providing browser updates than the I2P Project
+
+Browser Configurations and Coarse Fingerprints
+----------------------------------------------
+
+At this time it offers configuration for Tor Browser, Firefox, Waterfox, and
+LibreWolf for Firefox-based browsers, and Ungoogled-Chromium, Chromium, Brave,
+Chrome, and Edgium configuration for Chromium-based browsers. That is a total
+of **Nine(9)** main browsers. There are **Two(2)** variant configurations,
+which correspond to "Strict" and "Usability" Modes. That makes a total of
+**Eighteen(18)** coarse browser fingerprints produced by this bundle. It also
+has the ability to launch in a "Restricted to Apps" mode where it is only
+possible to visit I2P sites using links on the I2P application interface(router
+console, hidden services manager) itself.
+
+### Strict Mode
+
+This is not on its face as good as having an almost entirely unified browser
+fingerprint like Tor Browser attempts to have. It is a simple fact that 18
+is greater than one. Every active attempt to gain granularity from a browser
+outside of off-the-shelf Fingerprinting techniques is classified as "Fine"
+fingerprinting. It is unpredictable, and harder to defend against, more likely
+to exhibit novelty, and more likely to be affected by the host browser's
+security. When fingerprinters get this creative disabling Javascript by default
+is the most complete defense. This is the primary characteristic of Strict Mode,
+it disables Javascript by default with NoScript. **Strict Mode is the only**
+**partial defense against fine-fingerprinting offered by this product.** Even
+disabling Javascript does not close all fine fingerprinting vectors, but it
+does close most of them and reduce attack surface significantly. It is recommended
+in combination with Tor Browser, and attempts to be somewhat closer to Tor Browser
+than Usability Mode. It is the default mode of operation.
+
+### Usability Mode
+
+In contrast to Strict Mode, Usability mode offers the greatest agreeable number
+of browser features enabled by default, including a restricted subset of Javascript.
+It makes no attempt at all to look like Tor Browser, even when using Tor Browser
+as a host browser. It does attempt to optimize the browser for use within I2P, including
+specific optimizations to keep traffic in-network or even retrieve information which is
+stored on the localhost(while avoiding cache timing attacks). It does this by deploying
+an alternative loadout of extensions, including ones which block advertising by default
+and which include a cache of CDN resources in local browser storage.
+
+### Firefox-Based Browsers
+
+Because of the relatively high configurability of Firefox-based browser
+telemetry, Firefox-based browsers are preferred over Chromium-based browsers.
+Chromium-based browsers will be used by default **only** if a Firefox based
+browser is unavailable. Only Firefox-variant releases of the Extended Support
+Release or of the latest stable release are supportable. If a variant lags
+behind Firefox releases, it will be dropped. The primary reason for the default
+"Ordering" of Firefox Profile Selection is the speed at which updates can be
+expected to be applied.
+
+### Chromium-Based Browsers
+
+Chromium-based browser selection is more subjective and slightly more ad-hoc.
+Chromium browsers are chosen based on the variant's stated goals and perceived
+efficacy in pursuing those goals. For example, if a Chromium distribution is
+focused on removing telemetry or providing anti-fingerprinting, it is chosen
+before a Chromium that is provided by Google or integrated tightly with the
+host OS. This is a matter of judgement on my part and if you disagree you should
+open an issue and argue with me. I'm not infallible, I'll listen.
+
+### All other browsers
+
+With all other browsers attempts at anti-fingerprinting are a moot point. It offers
+limited configuration options using widely-supported generic browser configuration
+means. If it doesn't recognize a Firefox or Chromium browser on the host, then it
+sets the common proxy environment variables `http_proxy` `https_proxy` `ALL_PROXY`
+and `NO_PROXY` to their appropriate values before launching the browser configuration
+and attempts to set a directory for the runtime configuration(Profile) by changing
+to the profile directory.

docs/RELEASE.html

@@ -0,0 +1,221 @@
+<html>
+  <head>
+    <title>
+      I2P Easy-Install...
+    </title>
+    <meta name="author" content="eyedeekay" />
+    <meta name="description" content="i2p.firefox" />
+    <meta name="keywords" content="master" />
+    <link rel="stylesheet" type="text/css" href="style.css" />
+    <link rel="stylesheet" type="text/css" href="showhider.css" />
+    <link rel="stylesheet" type="text/css" href="darklight.css" />
+  </head>
+  <body>
+    <input type="checkbox" id="checkboxDarkLight">
+    <div class="container">
+      <div id="navbar">
+        <a href="#shownav">
+          Show navigation
+        </a>
+        <div id="shownav">
+          <div id="hidenav">
+            <ul>
+              <li>
+                <a href="..">
+                  Up one level ^
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index
+                </a>
+              </li>
+              <li>
+                <a href="LICENSE.html">
+                  LICENSE
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index.html
+                </a>
+              </li>
+              <li>
+                <a href="GOALS.html">
+                  GOALS
+                </a>
+              </li>
+              <li>
+                <a href="PRINCIPLES.html">
+                  PRINCIPLES
+                </a>
+              </li>
+              <li>
+                <a href="RELEASE.html">
+                  RELEASE
+                </a>
+              </li>
+              <li>
+                <a href="UPDATES.html">
+                  UPDATES
+                </a>
+              </li>
+            </ul>
+            <br>
+            <a href="#hidenav">
+              Hide Navigation
+            </a>
+          </div>
+        </div>
+      </div>
+      <a id="returnhome" href="/">
+        /
+      </a>
+      <h1>
+        I2P Easy-Install Bundle for Windows 2.4.9
+      </h1>
+      <p>
+        This is a pre-release of the I2P Easy-Install Bundle for Windows.
+        This changes how the I2P bundle and browser profile manager are installed and integrated with the host system.
+        The Easy-Install bundle is now a &ldquo;portable&rdquo; system that can be moved to different locations within or between Windows file-systems while retaining all built-in functionality.
+        A shortcut for starting the I2P router is still provided by the installer for convenience, but the shortcuts for starting the I2P Browser are now integrated with the I2P desktop UI.
+      </p>
+      <p>
+        The browser profile manager itself has been split away from the monolithic I2P router+Java/jpackage, and moved into an I2P plugin managed by the router.
+        While this was done primarily to reduce how complex the existing code was, this also results in behavior which is closer to the main distribution of I2P for Windows and will lead to a more flexible installer, which can bundle additional default plugins and may be suitable for installation as a Windows service.
+        I2P Plugins can also be updated independently of the router that hosts them, so it will be possible to update the browser profile manager independently of the router itself.
+        It also means that the browser profile manager can be un-installed by uninstalling the plugin, and much more importantly that the browser profile manager is now compatible with all Java I2P distributions.
+      </p>
+      <p>
+        <strong>
+          Why a dev build 3 weeks before the release?
+        </strong>
+      </p>
+      <p>
+        By further delineating the components of the bundle, these changes also affected how the release process happens.
+        In particular the build process of each component has been encapsulated in a CI description which can be reproduced on a local PC.
+        This simplifies and automates the build process by ensuring that up-to-date build tools are installed in a brand-new container for every build.
+        In effect this should speed up the release process for I2P Easy-Install for Windows considerably.
+        This release is a test-run of the new process, so I can document what is going on.
+        It breaks down roughly like this:
+      </p>
+      <ul>
+        <li>
+          It takes ~22 minutes to compile all the targets for the
+          <code>
+            i2p.plugins.firefox
+          </code>
+          and make the resulting artifacts available. During this process, I must insert 1 HSM and enter 1 password. (This part used to be about 30 steps, now it takes 1)
+        </li>
+        <li>
+          It takes ~22 minutes to compile all the targets for the
+          <code>
+            i2p.firefox
+          </code>
+          project and make the resulting artifacts available. This process produces only unsigned artifacts identified by their hashes, and is non-interactive. (This part used to be around 60 steps the first time, and 40 steps each additional time)
+        </li>
+        <li>
+          <code>
+            i2p.firefox
+          </code>
+          updates are signed in their
+          <code>
+            .su3
+          </code>
+          form. The
+          <code>
+            NSIS
+          </code>
+          -powered
+          <code>
+            .exe
+          </code>
+          installer is the current updater. The next step is to sign
+          <em>
+            just this installer
+          </em>
+          and generate a torrent of the result. (This process used to depend on the previous build process and couldn&rsquo;t be done independently. Now it takes about 30 seconds)
+        </li>
+        <li>
+          Generate and sign a newsfeed to notify the users of an update. This process is the only process that is
+          <strong>
+            slower
+          </strong>
+          when containerized, because there are dozens of feeds to be signed in their respective containers. It takes about an hour.
+        </li>
+      </ul>
+      <p>
+        For you the end user, nothing much should change.
+        You&rsquo;ll get your updates a lot faster, and have more options available for testing.
+        The same installer is used for the updater, and the process is handled the same way.
+        However for developers, testers, and maintainers, this release will result in big changes for the better.
+      </p>
+      <p>
+        This release still embeds a
+        <code>
+          2.4.0
+        </code>
+        Java I2P router. No changes have been made to update the embedded router.
+        Network behavior will be unchanged until the official
+        <code>
+          2.5.0
+        </code>
+        release.
+      </p>
+      <div id="sourcecode">
+        <span id="sourcehead">
+          <strong>
+            Get the source code:
+          </strong>
+        </span>
+        <ul>
+          <li>
+            <a href="https://github.com/eyedeekay/i2p.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.firefox)
+            </a>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <a href="#show">
+          Show license
+        </a>
+        <div id="show">
+          <div id="hide">
+            <pre><code>Copyright 2018
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+</code></pre>
+            <a href="#hide">
+              Hide license
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe>
+    </div>
+    <div>
+      <a href="https://geti2p.net/">
+        <img class="i2plogo" src="i2plogo.png"></img>
+        I2P
+      </a>
+    </div>
+  </body>
+</html>

docs/RELEASE.md

@@ -0,0 +1,3 @@
+# I2P Easy-Install 2.8.0
+
+This release updates the embedded I2P router to I2P 2.8.0.

docs/UPDATES.html

@@ -0,0 +1,182 @@
+<html>
+  <head>
+    <title>
+      I2P Easy-Install...
+    </title>
+    <meta name="author" content="eyedeekay" />
+    <meta name="description" content="i2p.firefox" />
+    <meta name="keywords" content="master" />
+    <link rel="stylesheet" type="text/css" href="style.css" />
+    <link rel="stylesheet" type="text/css" href="showhider.css" />
+    <link rel="stylesheet" type="text/css" href="darklight.css" />
+  </head>
+  <body>
+    <input type="checkbox" id="checkboxDarkLight">
+    <div class="container">
+      <div id="navbar">
+        <a href="#shownav">
+          Show navigation
+        </a>
+        <div id="shownav">
+          <div id="hidenav">
+            <ul>
+              <li>
+                <a href="..">
+                  Up one level ^
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index
+                </a>
+              </li>
+              <li>
+                <a href="LICENSE.html">
+                  LICENSE
+                </a>
+              </li>
+              <li>
+                <a href="index.html">
+                  index.html
+                </a>
+              </li>
+              <li>
+                <a href="GOALS.html">
+                  GOALS
+                </a>
+              </li>
+              <li>
+                <a href="PRINCIPLES.html">
+                  PRINCIPLES
+                </a>
+              </li>
+              <li>
+                <a href="RELEASE.html">
+                  RELEASE
+                </a>
+              </li>
+              <li>
+                <a href="UPDATES.html">
+                  UPDATES
+                </a>
+              </li>
+            </ul>
+            <br>
+            <a href="#hidenav">
+              Hide Navigation
+            </a>
+          </div>
+        </div>
+      </div>
+      <a id="returnhome" href="/">
+        /
+      </a>
+      <h1>
+        Setting up an Update Server for an I2P Bundle
+      </h1>
+      <p>
+        It is important to set up a signed update server so that people are able to
+        safely and anonymously update your I2P bundle. There are two sort of &ldquo;Levels&rdquo;
+        to what you might do to provide updates to your users. Each of them requires the
+        generation of a
+        <a href="https://eyedeekay.github.io/Hopefully-Holistic-Guide-to-I2P-Dev-Build-Update-Hosting/">
+          signed newsfeed
+        </a>
+        ,
+        which also serves as a way to provide information to your users about updates,
+        features, and security events.
+      </p>
+      <p>
+        This project,
+        <code>
+          i2p.firefox
+        </code>
+        a.k.a. the &ldquo;I2P Easy Install Bundle&rdquo; uses the &ldquo;Executable&rdquo;
+        update subtype, meaning that it capable of installing itself by executing code as the
+        user who runs the update, which is usually the main user of a Windows 10 or 11 PC.
+        This update subtype is highly flexible, but requires the creation of a &ldquo;Scripted&rdquo; using
+        something like
+        <code>
+          NSIS
+        </code>
+        ,
+        <code>
+          wixl
+        </code>
+        , or custom code. Other update types include ZIP (used by
+        the core I2P product) and DMG(used by Mac OSX).
+      </p>
+      <h1>
+        Static HTTP Update URL over I2P
+      </h1>
+      <h1>
+        Bittorrent Update URL over I2P
+      </h1>
+      <p>
+        <a href="https://github.com/i2p/i2p.plugins.zzzot">
+          If you choose to do this, consider using zzzot to host your open tracker instead of a normal site
+        </a>
+        ,
+        which you can obtain from
+        <a href="http://stats.i2p/i2p/plugins/zzzot.su3">
+          this I2P link
+        </a>
+        .
+      </p>
+      <div id="sourcecode">
+        <span id="sourcehead">
+          <strong>
+            Get the source code:
+          </strong>
+        </span>
+        <ul>
+          <li>
+            <a href="https://github.com/eyedeekay/i2p.firefox">
+              Source Repository: (https://github.com/eyedeekay/i2p.firefox)
+            </a>
+          </li>
+        </ul>
+      </div>
+      <div>
+        <a href="#show">
+          Show license
+        </a>
+        <div id="show">
+          <div id="hide">
+            <pre><code>Copyright 2018
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+</code></pre>
+            <a href="#hide">
+              Hide license
+            </a>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div>
+      <iframe src="https://snowflake.torproject.org/embed.html" width="320" height="240" frameborder="0" scrolling="no"></iframe>
+    </div>
+    <div>
+      <a href="https://geti2p.net/">
+        <img class="i2plogo" src="i2plogo.png"></img>
+        I2P
+      </a>
+    </div>
+  </body>
+</html>

docs/UPDATES.md

@@ -0,0 +1,25 @@
+Setting up an Update Server for an I2P Bundle
+=============================================
+
+It is important to set up a signed update server so that people are able to
+safely and anonymously update your I2P bundle. There are two sort of "Levels"
+to what you might do to provide updates to your users. Each of them requires the
+generation of a [signed newsfeed](https://eyedeekay.github.io/Hopefully-Holistic-Guide-to-I2P-Dev-Build-Update-Hosting/),
+which also serves as a way to provide information to your users about updates,
+features, and security events.
+
+This project, `i2p.firefox` a.k.a. the "I2P Easy Install Bundle" uses the "Executable"
+update subtype, meaning that it capable of installing itself by executing code as the
+user who runs the update, which is usually the main user of a Windows 10 or 11 PC.
+This update subtype is highly flexible, but requires the creation of a "Scripted" using
+something like `NSIS`, `wixl`, or custom code. Other update types include ZIP (used by
+the core I2P product) and DMG(used by Mac OSX).
+
+Static HTTP Update URL over I2P
+===============================
+
+Bittorrent Update URL over I2P
+==============================
+
+[If you choose to do this, consider using zzzot to host your open tracker instead of a normal site](https://github.com/i2p/i2p.plugins.zzzot),
+which you can obtain from [this I2P link](http://stats.i2p/i2p/plugins/zzzot.su3).

docs/darklight.css

@@ -0,0 +1,24 @@
+/* edgar darklight CSS file */
+#checkboxDarkLight:checked + .container {
+    background-color: #202020;
+    filter: invert(100%);
+}
+#checkboxDarkLight{
+    appearance: none;
+    width: 80px;
+    height: 40px;
+    background: black;
+    border-radius: 22px;
+    cursor: pointer;
+    outline: none;
+}
+#checkboxDarkLight::before{
+    content: '';
+    width: 40px;
+    height: 35px;
+    background-color:white;
+    border-radius: 35px;
+    cursor: pointer;
+    transition: .3s linear;
+}
+

docs/showhider.css

@@ -0,0 +1,15 @@
+/* edgar showhider CSS file */
+#show {display:none; }
+#hide {display:block; }
+#show:target {display: block; }
+#hide:target {display: none; }
+
+#shownav {display:none; }
+#hidenav {display:block; }
+#shownav:target {display: block; }
+#hidenav:target {display: none; }
+
+#donate {display:none; }
+#hidedonate {display:block; }
+#donate:target {display: block; }
+#hidedonate:target {display: none; }

docs/style.css

@@ -0,0 +1,163 @@
+/* edgar default CSS file */
+
+body {
+    font-family: "Roboto";
+    font-family: monospace;
+    text-align: justify;
+    background-color: #373636;
+    color: whitesmoke;
+    font-size: 1.15em;
+}
+
+ul {
+    width: 55%;
+    display: block;
+}
+
+ol {
+    width: 55%;
+    display: block;
+}
+
+li {
+    margin-top: 1%;
+}
+
+p {
+    max-width: 90%;
+    margin-top: 1%;
+    margin-left: 3%;
+    margin-right: 3%;
+}
+
+img {
+    float: left;
+    top: 5%;
+    left: 5%;
+    max-width: 60%;
+    display: inline;
+    padding-right: 2%;
+}
+
+.inline {
+    display: inline;
+}
+
+.link-button:focus {
+    outline: none;
+}
+
+.link-button:active {
+    color: red;
+}
+
+code {
+    font-family: monospace;
+    border-radius: 5%;
+    padding: 1%;
+    border-color: darkgray;
+    font-size: .9em;
+}
+
+a {
+    color: #C6D9FE;
+    padding: 1%;
+}
+
+ul li {
+    color: #C6D9FE;
+}
+
+iframe {
+    background: aliceblue;
+    border-radius: 15%;
+    margin: 2%;
+}
+
+.container {
+    display: inline-block;
+    margin: 0;
+    padding: 0;
+}
+
+.editor-toolbar a {
+    display: inline-block;
+    text-align: center;
+    text-decoration: none !important;
+    color: whitesmoke !important;
+}
+
+#feed {
+    width: 60vw;
+    height: unset !important;
+    margin: 0;
+    padding: 0;
+    float: right;
+    background-color: #373636;
+    color: whitesmoke;
+    border: #C6D9FE solid 1px;
+}
+
+.thread-post,
+.thread {
+    color: whitesmoke !important;
+    background-color: #373636;
+    border: 1px solid darkgray;
+    font-size: inherit;
+    padding-top: 1%;
+    padding-bottom: 1%;
+}
+
+.thread-post {
+    margin-left: 4%;
+}
+
+input {
+    text-align: center;
+    color: whitesmoke !important;
+    background-color: #373636;
+    border: 1px solid darkgray;
+    font: normal normal normal 14px/1 FontAwesome;
+    font-size: inherit;
+    padding-top: 1%;
+    padding-bottom: 1%;
+}
+
+.thread-hash {
+    text-align: right;
+    color: whitesmoke !important;
+    background-color: #373636;
+    border: 1px solid darkgray;
+    font-size: inherit;
+    padding-top: 1%;
+    padding-bottom: 1%;
+}
+
+.post-body {
+    text-align: left;
+    color: whitesmoke !important;
+    font-size: inherit;
+    padding-top: 1%;
+    padding-bottom: 1%;
+}
+#show {display:none; }
+#hide {display:block; }
+#show:target {display: block; }
+#hide:target {display: none; }
+
+#shownav {display:none; }
+#hidenav {display:block; }
+#shownav:target {display: block; }
+#hidenav:target {display: none; }
+
+#navbar {
+	float: right;
+	width: 15%;
+}
+#returnhome {
+    font-size: xxx-large;
+    display: inline;
+}
+h1 {
+    display: inline;
+}

experimental.sh

@@ -1,17 +0,0 @@
-#! /usr/bin/env bash
-
-SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
-cd "$SCRIPT_DIR" || exit 1
-
-. "$SCRIPT_DIR/config.sh"
-
-if [ -f config_overide.sh ]; then
-  . "$SCRIPT_DIR/config_override.sh"
-fi
-
-./clean.sh
-wsl make distclean
-wsl make clean-extensions
-wsl make new-extensions
-./build.sh
-wsl make

i2ptunnel.config

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

i2pversion

@@ -1,16 +1,39 @@
 #! /usr/bin/env sh
 
-JNA_VERSION=5.11.0
-export JNA_VERSION=5.11.0
-I2PFIREFOX_VERSION=0.0.34
-export I2PFIREFOX_VERSION=0.0.36
+JNA_VERSION=5.12.1
+export JNA_VERSION=5.12.1
+
+export GITHUB_TAG=$(git describe --tags --abbrev=0 | sed 's|i2p||g' | tr -d [a-z-])
+if [ -z "$VERSIONMAJOR" ]; then
+    VERSIONMAJOR=$(echo "$GITHUB_TAG" | cut -d . -f 1)
+fi
+if [ -z "$VERSIONMINOR" ]; then
+    VERSIONMINOR=$(echo "$GITHUB_TAG" | cut -d . -f 2)
+fi
+if [ -z "$VERSIONBUILD" ]; then
+    VERSIONBUILD=$(echo "$GITHUB_TAG" | cut -d . -f 3)
+fi
+if [ -z "$VERSIONMAJOR" ]; then
+    I2P_VERSION="master"
+    export I2P_VERSION="master"
+    VERSION="master"
+    export VERSION="master"
+    I2PFIREFOX_VERSION="2.9.0"
+    export I2PFIREFOX_VERSION="2.9.0"
+else
+    I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+    export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+    VERSION="i2p-$I2P_VERSION"
+    export VERSION="i2p-$I2P_VERSION"
+    I2PFIREFOX_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+    export I2PFIREFOX_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+fi
+
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
-VERSIONMAJOR=1
-VERSIONMINOR=9
-VERSIONBUILD=5
-I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
-export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
-VERSION=i2p-jpackage-1.9.4
-export VERSION=i2p-jpackage-1.9.4
+#VERSION=i2p-2.4.0
+#export VERSION=i2p-2.4.0
 
+echo "I2P version $I2P_VERSION"
+echo "Tag $VERSION"
+echo "I2P Firefox Profile version $I2PFIREFOX_VERSION"

java/net/i2p/router/CopyConfigDir.java

@@ -1,293 +0,0 @@
-package net.i2p.router;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.logging.FileHandler;
-import java.util.logging.Logger;
-import java.util.logging.SimpleFormatter;
-
-public class CopyConfigDir {
-  static Logger logger = Logger.getLogger("configlog");
-  static WindowsUpdatePostProcessor wupp = null;
-  static FileHandler fh;
-
-  public CopyConfigDir() {
-    try {
-      // This block configure the logger with handler and formatter
-      fh = new FileHandler(logFile().toString());
-      logger.addHandler(fh);
-      SimpleFormatter formatter = new SimpleFormatter();
-      fh.setFormatter(formatter);
-      // the following statement is used to log any messages
-      logger.info("My first log");
-    } catch (SecurityException e) {
-      e.printStackTrace();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-  }
-
-  public static boolean copyDirectory(String baseDir, String workDir) {
-    File baseFile = new File(baseDir);
-    File workFile = new File(workDir);
-    return copyDirectory(baseFile, workFile);
-  }
-
-  public static boolean copyDirectory(File baseDir, File workDir) {
-    for (File file : baseDir.listFiles()) {
-      String fPath = file.getAbsolutePath().replace(
-          file.getParentFile().getAbsolutePath(), "");
-      String newPath = workDir.toString() + fPath;
-      if (file.isDirectory())
-        if (copyDirectory(file, new File(newPath)))
-          return false;
-      if (file.isFile())
-        if (!copyFile(file, new File(newPath), true))
-          return false;
-    }
-    return true;
-  }
-
-  public static boolean copyConfigDirectory(File baseDir, File workDir) {
-    for (File file : baseDir.listFiles()) {
-      // System.out.println(file.getAbsolutePath());
-      String fPath = file.getAbsolutePath().replace(
-          file.getParentFile().getAbsolutePath(), "");
-      String newPath = workDir.toString() + fPath;
-      if (file.isDirectory())
-        if (!copyConfigDirectory(file, new File(newPath)))
-          return false;
-      if (file.isFile())
-        if (!copyFileNeverOverwrite(
-                file,
-                new File(newPath))) // new File(workDir, file.toString())))
-          return false;
-    }
-    return true;
-  }
-
-  public static boolean copyFileNeverOverwrite(String basePath,
-                                               String workPath) {
-    File baseFile = new File(basePath);
-    File workFile = new File(workPath);
-    return copyFileNeverOverwrite(baseFile, workFile);
-  }
-
-  public static boolean copyFileNeverOverwrite(File basePath, File workPath) {
-    return copyFile(basePath, workPath, false);
-  }
-
-  public static boolean copyFile(File basePath, File workPath,
-                                 boolean overWrite) {
-    if (!basePath.exists()) {
-      logger.info(basePath.getAbsolutePath() + " doesn't exist, not copying");
-      return false;
-    }
-
-    if (!overWrite && workPath.exists()) {
-      logger.info(workPath.getAbsolutePath() +
-                  " already exists, not overwriting");
-      return true;
-    }
-
-    File workDir = workPath.getParentFile();
-    if (!workDir.exists()) {
-      workDir.mkdirs();
-    }
-    try (InputStream in =
-             new BufferedInputStream(new FileInputStream(basePath));
-         OutputStream out =
-             new BufferedOutputStream(new FileOutputStream(workPath))) {
-
-      byte[] buffer = new byte[1024];
-      int lengthRead;
-      while ((lengthRead = in.read(buffer)) > 0) {
-        out.write(buffer, 0, lengthRead);
-        out.flush();
-      }
-      in.close();
-      out.close();
-      return true;
-    } catch (Throwable e) {
-      logger.warning(e.toString());
-      logger.warning("failed to copy " + basePath.getAbsolutePath() + " to " +
-                     workPath.getAbsolutePath());
-      return false;
-    }
-  }
-
-  protected static File selectHome() { // throws Exception {
-    String path_override = System.getenv("I2P_CONFIG");
-    if (path_override != null) {
-      File path = new File(path_override);
-      if (path != null && path.exists()) {
-        if (path.isDirectory())
-          return path.getAbsoluteFile();
-        else
-          throw new RuntimeException("I2P_CONFIG is not a directory: " + path);
-      }
-    }
-    if (osName() == "windows") {
-      File i2p = appImageHome();
-      logger.info("Checking for signs of life in I2P directory: " + i2p);
-      return i2p;
-    } else {
-      File i2p = appImageHome();
-      File programs = new File(i2p, ".i2p");
-      logger.info("Linux portable jpackage wrapper starting up, using: " +
-                  programs + " as base config");
-      return programs.getAbsoluteFile();
-    }
-  }
-
-  protected static File selectProgramFile() {
-    String path_override = System.getenv("I2P");
-    if (path_override != null) {
-      File path = new File(path_override);
-      if (path.exists()) {
-        if (path.isDirectory())
-          return path.getAbsoluteFile();
-        else
-          throw new RuntimeException("I2P is not a directory: " + path);
-      }
-    }
-    if (osName() == "windows") {
-      File jrehome = new File(System.getProperty("java.home"));
-      File programs = jrehome.getParentFile();
-      logger.info("Windows portable jpackage wrapper found, using: " +
-                  programs + " as working config");
-      return programs.getAbsoluteFile();
-    } else {
-      File jrehome = new File(System.getProperty("java.home"));
-      File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
-      logger.info("Linux portable jpackage wrapper found, using: " + programs +
-                  " as working config");
-      return programs.getAbsoluteFile();
-    }
-  }
-
-  /**
-   * get the OS name(windows, mac, linux only)
-   *
-   * @return os name in lower-case, "windows" "mac" or  "linux"
-   */
-  protected static String osName() {
-    String osName = System.getProperty("os.name").toLowerCase();
-    if (osName.contains("windows"))
-      return "windows";
-    if (osName.contains("mac"))
-      return "mac";
-    return "linux";
-  }
-
-  /**
-   * get the path to the java home, for jpackage this is related to the
-   * executable itself, which is handy to know. It's a directory called runtime,
-   * relative to the root of the app-image on each platform:
-   *
-   * Windows - Root of appimage is 1 directory above directory named runtime
-   *     ./runtime
-   *
-   * Linux - Root of appimage is 2 directories above directory named runtime
-   *     ./lib/runtime
-   *
-   * Mac OSX - Unknown for now
-   *
-   * @return
-   */
-  protected static File javaHome() {
-    File jrehome = new File(System.getProperty("java.home"));
-    if (jrehome != null) {
-      if (jrehome.exists()) {
-        return jrehome;
-      }
-    }
-    return null;
-  }
-
-  /**
-   * get the path to the root 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.
-   *
-   * @return the app-image root
-   */
-  protected static File appImageHome() {
-    File jreHome = javaHome();
-    if (jreHome != null) {
-      switch (osName()) {
-      case "windows":
-        return jreHome.getAbsoluteFile().getParentFile();
-      case "mac":
-      case "linux":
-        return jreHome.getAbsoluteFile().getParentFile().getParentFile();
-      }
-    }
-    return null;
-  }
-
-  /**
-   * get the path to the default config of the app-image by getting the path to
-   * java.home and the OS, and traversing up to the app-image root based on that
-   * information, then appending the config directory to the end onn a
-   * per-platform basis
-   *
-   * @return the app-image root
-   */
-  protected static File appImageConfig() {
-    File aih = appImageHome();
-    if (aih == null) {
-      return null;
-    }
-    String osName = osName();
-    switch (osName) {
-    case "windows":
-      File winConfigDir = new File(aih, "config");
-      if (winConfigDir != null) {
-        if (winConfigDir.exists()) {
-          return winConfigDir;
-        }
-      }
-    case "mac":
-    case "linux":
-      File linConfigDir = new File(aih, "lib/config");
-      if (linConfigDir != null) {
-        if (linConfigDir.exists()) {
-          return linConfigDir;
-        }
-      }
-    }
-    return null;
-  }
-
-  protected static boolean copyConfigDir() {
-    File appImageConfigDir = appImageConfig();
-    File appImageHomeDir = appImageHome();
-    return copyConfigDirectory(appImageConfigDir, appImageHomeDir);
-  }
-
-  /**
-   * set up the path to the log file
-   *
-   * @return
-   */
-  protected static File logFile() { return logFile("launcher.log"); }
-
-  /**
-   * set up the path to the log file
-   *
-   * @return
-   */
-  protected static File logFile(String p) {
-    File log = new File(selectProgramFile(), "logs");
-    if (!log.exists())
-      log.mkdirs();
-    return new File(log, p);
-  }
-}

java/net/i2p/router/Elevator.java

@@ -1,35 +0,0 @@
-package net.i2p.router;
-
-import com.sun.jna.WString;
-import com.sun.jna.platform.win32.Kernel32;
-import com.sun.jna.platform.win32.Kernel32Util;
-
-public class Elevator {
-  public static void main(String... args) {
-    executeAsAdministrator("c:\\windows\\system32\\notepad.exe", "");
-  }
-
-  public static void executeAsAdministrator(String command, String args) {
-    if (command == "" || command == null) {
-      System.out.println("No command specified");
-      return;
-    }
-    Shell32X.SHELLEXECUTEINFO execInfo = new Shell32X.SHELLEXECUTEINFO();
-    execInfo.lpFile = new WString(command);
-    if (args != null)
-      execInfo.lpParameters = new WString(args);
-    execInfo.nShow = Shell32X.SW_SHOWDEFAULT;
-    execInfo.fMask = Shell32X.SEE_MASK_NOCLOSEPROCESS;
-    execInfo.lpVerb = new WString("runas");
-    boolean result = Shell32X.INSTANCE.ShellExecuteEx(execInfo);
-
-    if (!result) {
-      int lastError = Kernel32.INSTANCE.GetLastError();
-      String errorMessage =
-          Kernel32Util.formatMessageFromLastErrorCode(lastError);
-      throw new RuntimeException("Error performing elevation: " + lastError +
-                                 ": " + errorMessage +
-                                 " (apperror=" + execInfo.hInstApp + ")");
-    }
-  }
-}

java/net/i2p/router/I2PAppUtil.java

@@ -0,0 +1,83 @@
+package net.i2p.router;
+
+import java.io.File;
+import java.io.IOException;
+import javax.swing.JOptionPane;
+import net.i2p.router.RouterContext;
+
+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;
+  }
+}

java/net/i2p/router/Shell32X.java

@@ -1,123 +0,0 @@
-package net.i2p.router;
-
-import com.sun.jna.Native;
-import com.sun.jna.Pointer;
-import com.sun.jna.Structure;
-import com.sun.jna.WString;
-import com.sun.jna.platform.win32.Shell32;
-import com.sun.jna.platform.win32.WinDef.HINSTANCE;
-import com.sun.jna.platform.win32.WinDef.HWND;
-import com.sun.jna.platform.win32.WinNT.HANDLE;
-import com.sun.jna.platform.win32.WinReg.HKEY;
-import com.sun.jna.win32.W32APIOptions;
-import java.util.*;
-
-public interface Shell32X extends Shell32 {
-  Shell32X INSTANCE = (Shell32X)Native.loadLibrary(
-      "shell32", Shell32X.class, W32APIOptions.UNICODE_OPTIONS);
-
-  int SW_HIDE = 0;
-  int SW_MAXIMIZE = 3;
-  int SW_MINIMIZE = 6;
-  int SW_RESTORE = 9;
-  int SW_SHOW = 5;
-  int SW_SHOWDEFAULT = 10;
-  int SW_SHOWMAXIMIZED = 3;
-  int SW_SHOWMINIMIZED = 2;
-  int SW_SHOWMINNOACTIVE = 7;
-  int SW_SHOWNA = 8;
-  int SW_SHOWNOACTIVATE = 4;
-  int SW_SHOWNORMAL = 1;
-
-  /** File not found. */
-  int SE_ERR_FNF = 2;
-
-  /** Path not found. */
-  int SE_ERR_PNF = 3;
-
-  /** Access denied. */
-  int SE_ERR_ACCESSDENIED = 5;
-
-  /** Out of memory. */
-  int SE_ERR_OOM = 8;
-
-  /** DLL not found. */
-  int SE_ERR_DLLNOTFOUND = 32;
-
-  /** Cannot share an open file. */
-  int SE_ERR_SHARE = 26;
-
-  int SEE_MASK_NOCLOSEPROCESS = 0x00000040;
-
-  int ShellExecute(int i, String lpVerb, String lpFile, String lpParameters,
-                   String lpDirectory, int nShow);
-
-  boolean ShellExecuteEx(SHELLEXECUTEINFO lpExecInfo);
-
-  public static class SHELLEXECUTEINFO extends Structure {
-    /*
-     * DWORD cbSize;
-     * ULONG fMask;
-     * HWND hwnd;
-     * LPCTSTR lpVerb;
-     * LPCTSTR lpFile;
-     * LPCTSTR lpParameters;
-     * LPCTSTR lpDirectory;
-     * int nShow;
-     * HINSTANCE hInstApp;
-     * LPVOID lpIDList;
-     * LPCTSTR lpClass;
-     * HKEY hkeyClass;
-     * DWORD dwHotKey;
-     * union {
-     * HANDLE hIcon;
-     * HANDLE hMonitor;
-     * } DUMMYUNIONNAME;
-     * HANDLE hProcess;
-     */
-
-    public int cbSize = size();
-    public int fMask;
-    public HWND hwnd;
-    public WString lpVerb;
-    public WString lpFile;
-    public WString lpParameters;
-    public WString lpDirectory;
-    public int nShow;
-    public HINSTANCE hInstApp;
-    public Pointer lpIDList;
-    public WString lpClass;
-    public HKEY hKeyClass;
-    public int dwHotKey;
-
-    /*
-     * Actually:
-     * union {
-     * HANDLE hIcon;
-     * HANDLE hMonitor;
-     * } DUMMYUNIONNAME;
-     */
-    public HANDLE hMonitor;
-    public HANDLE hProcess;
-
-    protected List getFieldOrder() {
-      return Arrays.asList(new String[] {
-          "cbSize",
-          "fMask",
-          "hwnd",
-          "lpVerb",
-          "lpFile",
-          "lpParameters",
-          "lpDirectory",
-          "nShow",
-          "hInstApp",
-          "lpIDList",
-          "lpClass",
-          "hKeyClass",
-          "dwHotKey",
-          "hMonitor",
-          "hProcess",
-      });
-    }
-  }
-}

java/net/i2p/router/WinLauncher.java

@@ -1,27 +1,22 @@
 package net.i2p.router;
 
-import static net.i2p.update.UpdateType.*;
-
 import java.io.*;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.*;
-import java.util.logging.FileHandler;
-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.router.Router;
 import net.i2p.router.RouterLaunch;
 import net.i2p.update.*;
 import net.i2p.update.UpdateManager;
-import net.i2p.update.UpdatePostProcessor;
+import net.i2p.update.UpdateType.*;
+import net.i2p.util.Log;
 
 /**
- * Launches a router from %PROGRAMFILES%/I2P using configuration data in
- * %LOCALAPPDATA%/I2P.. Uses Java 9 APIs.
+ * Launches a router from %WORKINGDIR%/I2P using configuration data in
+ * %WORKINGDIR%/I2P.. Uses Java 9 APIs.
  *
  * Sets the following properties:
  * i2p.dir.base - this points to the (read-only) resources inside the bundle
@@ -29,84 +24,21 @@ import net.i2p.update.UpdatePostProcessor;
  * appdata
  * router.pid - the pid of the java process.
  */
-public class WinLauncher extends CopyConfigDir {
-  static WindowsUpdatePostProcessor wupp = null;
-  private static Router i2pRouter;
-
-  public static void main(String[] args) throws Exception {
-    setupLauncher();
-    boolean privateBrowsing = false;
-    boolean usabilityMode = false;
-    boolean chromiumFirst = false;
-    int proxyTimeoutTime = 200;
-    ArrayList<String> newArgsList = new ArrayList<String>();
-
-    if (args != null) {
-      if (args.length > 0) {
-        for (String arg : args) {
-          if (arg.equals("-private")) {
-            privateBrowsing = true;
-            logger.info(
-                "Private browsing is true, profile will be discarded at end of session.");
-          } else if (arg.equals("-chromium")) {
-            chromiumFirst = true;
-            logger.info("Chromium will be selected before Firefox.");
-          } else if (arg.equals("-usability")) {
-            usabilityMode = true;
-            logger.info(
-                "Usability mode is true, using alternate extensions loadout.");
-          } else if (arg.equals("-noproxycheck")) {
-            proxyTimeoutTime = 0;
-            logger.info("Proxy timeout time set to zero");
-          } else {
-            // make an effort to not let people launch into sites if the proxy
-            // isn't quite ready yet, but also disable the proxy timeout if
-            // they're reaching a router console
-            if (arg.startsWith("http://localhost:76")) {
-              newArgsList.add(arg);
-              proxyTimeoutTime = 0;
-            } else if (arg.startsWith("http://127.0.0.1:76")) {
-              newArgsList.add(arg);
-              proxyTimeoutTime = 0;
-            } else if (arg.startsWith("https://localhost:76")) {
-              newArgsList.add(arg);
-              proxyTimeoutTime = 0;
-            } else if (arg.startsWith("https://127.0.0.1:76")) {
-              newArgsList.add(arg);
-              proxyTimeoutTime = 0;
-            } else if (proxyTimeoutTime > 0) {
-              newArgsList.add(arg);
-            } else if (!isAvailable(4444)) {
-              newArgsList.add(arg);
-            }
-          }
-        }
-      }
-    }
+public class WinLauncher extends I2PAppUtil {
+  // private final CopyConfigDir copyConfigDir;
+  WinUpdatePostProcessor wupp = null;
+  private Router i2pRouter;
+  private final Log logger;
 
+  public WinLauncher() {
     File programs = programFile();
-    File home = homeDir();
 
-    // This actually does most of what we use NSIS for if NSIS hasn't
-    // already done it, which essentially makes this whole thing portable.
-    if (!copyConfigDir()) {
-      logger.severe("Cannot copy the configuration directory");
-      System.exit(1);
-    }
-
-    if (launchBrowser(privateBrowsing, usabilityMode, chromiumFirst,
-                      proxyTimeoutTime, newArgsList)) {
-      System.exit(0);
-    }
-
-    System.setProperty("i2p.dir.base", programs.getAbsolutePath());
-    System.setProperty("i2p.dir.config", home.getAbsolutePath());
+    System.setProperty(
+        "i2p.dir.base",
+        appImageConfig().getAbsolutePath());
+    System.setProperty("i2p.dir.config", appImageConfig().getAbsolutePath());
     System.setProperty("router.pid",
-                       String.valueOf(ProcessHandle.current().pid()));
-    logger.info("\t" + System.getProperty("i2p.dir.base") + "\n\t" +
-                System.getProperty("i2p.dir.config") + "\n\t" +
-                System.getProperty("router.pid"));
-
+        String.valueOf(ProcessHandle.current().pid()));
     /**
      * IMPORTANT: You must set user.dir to the same directory where the
      * jpackage is intstalled, or when the launcher tries to re-run itself
@@ -115,95 +47,81 @@ public class WinLauncher extends CopyConfigDir {
      */
     System.setProperty("user.dir", programs.getAbsolutePath());
 
-    i2pRouter = new Router(System.getProperties());
-    logger.info("Router is configured");
+    i2pRouter = new Router(routerConfig(), System.getProperties());
+    this.setLog(i2pRouter.getContext().logManager().getLog(WindowsAppUtil.class));
+    // copyConfigDir = new CopyConfigDir(i2pRouter.getContext());
+    logger = i2pRouter.getContext().logManager().getLog(WinLauncher.class);
+  }
 
-    Thread registrationThread = new Thread(REGISTER_UPP);
+  public static void main(String[] args) {
+    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"));
+    launcher.logger.info("\t" + System.getProperty("router.pid"));
+    boolean continuerunning = launcher.promptServiceStartIfAvailable("i2p");
+    if (!continuerunning) {
+      launcher.logger.error(
+          "Service startup failure, please start I2P service with services.msc");
+      System.exit(2);
+    }
+    continuerunning = launcher.promptUserInstallStartIfAvailable();
+    if (!continuerunning) {
+      launcher.logger.error("User-install startup required.");
+      System.exit(2);
+    }
+
+    // This actually does most of what we use NSIS for if NSIS hasn't
+    // already done it, which essentially makes this whole thing portable.
+    /*
+     * if (!launcher.copyConfigDir.copyConfigDir()) {
+     * launcher.logger.error("Cannot copy the configuration directory");
+     * System.exit(1);
+     * }
+     */
+
+    if (!launcher.isInstalled("i2p")) {
+      if (launcher.i2pRouter.saveConfig("routerconsole.browser", "NUL")) {
+        launcher.logger.info("updated routerconsole.browser config " +
+            launcher.appImageExe());
+      }
+    }
+    launcher.logger.info("Router is configured");
+
+    Thread registrationThread = new Thread(launcher.REGISTER_UPP);
     registrationThread.setName("UPP Registration");
     registrationThread.setDaemon(true);
     registrationThread.start();
 
-    setNotStarting();
-
-    i2pRouter.runRouter();
-    System.exit(0);
+    launcher.i2pRouter.runRouter();
   }
 
-  private static void setupLauncher() {
-    try {
-      // This block configure the logger with handler and formatter
-      fh = new FileHandler(logFile().toString());
-      logger.addHandler(fh);
-      SimpleFormatter formatter = new SimpleFormatter();
-      fh.setFormatter(formatter);
-      // the following statement is used to log any messages
-      logger.info("My first log");
-    } catch (SecurityException e) {
-      e.printStackTrace();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-
+  private void setupLauncher() {
     File jrehome = javaHome();
     logger.info("jre home is: " + jrehome.getAbsolutePath());
     File appimagehome = appImageHome();
     logger.info("appimage home is: " + appimagehome.getAbsolutePath());
   }
 
-  private static File programFile() {
-    File programs = selectProgramFile();
+  private File programFile() {
+    File programs = selectHome();
     if (!programs.exists())
       programs.mkdirs();
     else if (!programs.isDirectory()) {
-      logger.warning(
+      logger.warn(
           programs +
-          " exists but is not a directory. Please get it out of the way");
+              " exists but is not a directory. Please get it out of the way");
       System.exit(1);
     }
     return programs;
   }
 
-  private static File homeDir() {
-    File home = selectHome();
-    if (!home.exists())
-      home.mkdirs();
-    else if (!home.isDirectory()) {
-      logger.warning(
-          home +
-          " exists but is not a directory. Please get it out of the way");
-      System.exit(1);
-    }
-    return home;
-  }
-
-  private static boolean launchBrowser(boolean 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 static boolean isAvailable(int portNr) {
+  private boolean isAvailable(int portNr) {
     boolean portFree;
     try (var ignored = new ServerSocket(portNr)) {
       portFree = true;
@@ -213,88 +131,7 @@ public class WinLauncher extends CopyConfigDir {
     return portFree;
   }
 
-  private static boolean i2pIsRunningCheck() {
-    // check if there's something listening on port 7657(Router Console)
-    if (!isAvailable(7657))
-      return true;
-    // check if there's something listening on port 7654(I2CP)
-    if (!isAvailable(7654))
-      return true;
-    if (checkPing())
-      return true;
-    return false;
-  }
-
-  private static void setNotStarting() {
-    logger.info("removing startup file, the application has started");
-    File home = selectHome();
-    File starting = new File(home, "starting");
-    if (starting.exists()) {
-      starting.delete();
-    }
-  }
-
-  private static void setStarting() {
-    logger.info("creating startup file, router is starting up");
-    File home = selectHome();
-    File starting = new File(home, "starting");
-    if (!starting.exists()) {
-      try {
-        starting.createNewFile();
-      } catch (IOException e) {
-        logger.info(e.toString());
-      }
-    }
-  }
-
-  private static boolean checkStarting() {
-    logger.info("checking startup file");
-    File home = selectHome();
-    File starting = new File(home, "starting");
-    if (starting.exists()) {
-      logger.info("startup file exists, I2P is already starting up");
-      return true;
-    }
-    logger.info("startup file does not exist but we're running now");
-    setStarting();
-    return false;
-  }
-
-  // check for the existence of router.ping file, if it's less then 2
-  // minutes old, exit
-  private static boolean checkPing() {
-    File home = selectHome();
-    File ping = new File(home, "router.ping");
-    if (ping.exists()) {
-      long diff = System.currentTimeMillis() - ping.lastModified();
-      if (diff > 60 * 1000) {
-        logger.info(
-            "router.ping exists and is more than 1 minute old, I2P does not appear to be running.");
-        logger.info("If I2P is running, report this as a bug.");
-        return false;
-      } else {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private static boolean i2pIsRunning() {
-    if (checkStarting())
-      return true;
-    if (checkPing())
-      return true;
-    if (i2pIsRunningCheck())
-      return true;
-    for (int i = 0; i < 10; i++) {
-      if (i2pIsRunningCheck())
-        return true;
-      sleep(1000);
-    }
-    return false;
-  }
-
-  private static final Runnable REGISTER_UPP = () -> {
+  private final Runnable REGISTER_UPP = () -> {
     RouterContext ctx;
     while ((ctx = i2pRouter.getContext()) == null) {
       sleep(1000);
@@ -305,11 +142,10 @@ public class WinLauncher extends CopyConfigDir {
       sleep(1000);
     }
     UpdateManager um;
-    while ((um = (UpdateManager)cam.getRegisteredApp(UpdateManager.APP_NAME)) ==
-           null) {
+    while ((um = (UpdateManager) cam.getRegisteredApp(UpdateManager.APP_NAME)) == null) {
       sleep(1000);
     }
-    WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor(ctx);
+    WinUpdatePostProcessor wupp = new WinUpdatePostProcessor(ctx);
     um.register(wupp, UpdateType.ROUTER_SIGNED_SU3, SU3File.TYPE_EXE);
     um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE);
   };
@@ -319,7 +155,7 @@ public class WinLauncher extends CopyConfigDir {
    *
    * @param millis
    */
-  private static void sleep(int millis) {
+  private void sleep(int millis) {
     try {
       Thread.sleep(millis);
     } catch (InterruptedException bad) {

java/net/i2p/router/WinUpdatePostProcessor.java

@@ -16,7 +16,7 @@ import net.i2p.update.UpdateType;
 import net.i2p.util.Log;
 import net.i2p.util.SystemVersion;
 
-public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
+public class WinUpdatePostProcessor implements UpdatePostProcessor {
   private final Log _log;
   private final RouterContext ctx;
   private final AtomicBoolean hook = new AtomicBoolean();
@@ -26,27 +26,30 @@ public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
 
   private volatile File positionedFile = null;
 
-  WindowsUpdatePostProcessor(RouterContext ctx) {
+  WinUpdatePostProcessor(RouterContext ctx) {
     this.ctx = ctx;
-    this._log = ctx.logManager().getLog(WindowsUpdatePostProcessor.class);
+    this._log = ctx.logManager().getLog(WinUpdatePostProcessor.class);
   }
 
-  public String getVersion() { return version; }
+  public String getVersion() {
+    return version;
+  }
 
-  public File getFile() { return positionedFile; }
+  public File getFile() {
+    return positionedFile;
+  }
 
   public void updateDownloadedandVerified(UpdateType type, int fileType,
-                                          String version, File file)
+      String version, File file)
       throws IOException {
     _log.info("Got an update to post-process");
+    if (type != UpdateType.ROUTER_SIGNED_SU3 &&
+        type != UpdateType.ROUTER_DEV_SU3) {
+      _log.warn("Unsupported update type " + type);
+      return;
+    }
     if (SystemVersion.isWindows()) {
 
-      if (type != UpdateType.ROUTER_SIGNED_SU3 &&
-          type != UpdateType.ROUTER_DEV_SU3) {
-        _log.warn("Unsupported update type " + type);
-        return;
-      }
-
       if (fileType != SU3File.TYPE_EXE) {
         _log.warn("Unsupported file type " + fileType);
         return;
@@ -64,6 +67,21 @@ public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
 
       ctx.addFinalShutdownTask(
           new WinUpdateProcess(ctx, this::getVersion, this::getFile));
+    } else {
+      if (fileType == SU3File.TYPE_ZIP) {
+        this.positionedFile = moveUpdateInstaller(file);
+        this.version = version;
+
+        if (!hook.compareAndSet(false, true)) {
+          _log.info("shutdown hook was already set");
+          return;
+        }
+
+        _log.info("adding shutdown hook");
+
+        ctx.addFinalShutdownTask(
+            new ZipUpdateProcess(ctx, this::getVersion, this::getFile));
+      }
     }
   }
 
@@ -83,12 +101,11 @@ public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
 
   private File workDir() throws IOException {
     if (this.ctx != null) {
-      File workDir =
-          new File(this.ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
+      File workDir = new File(this.ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
       if (workDir.exists()) {
         if (workDir.isFile())
           throw new IOException(workDir +
-                                " exists but is a file, get it out of the way");
+              " exists but is a file, get it out of the way");
         return null;
       } else {
         workDir.mkdirs();

java/net/i2p/router/WinUpdateProcess.java

@@ -1,6 +1,7 @@
 package net.i2p.router;
 
 import java.io.*;
+import java.util.Map;
 import java.util.function.*;
 import net.i2p.I2PAppContext;
 import net.i2p.router.*;
@@ -13,7 +14,7 @@ class WinUpdateProcess implements Runnable {
   private final Log _log;
 
   WinUpdateProcess(RouterContext ctx, Supplier<String> versionSupplier,
-                   Supplier<File> fileSupplier) {
+      Supplier<File> fileSupplier) {
     this.ctx = ctx;
     this.versionSupplier = versionSupplier;
     this.fileSupplier = fileSupplier;
@@ -22,12 +23,11 @@ class WinUpdateProcess implements Runnable {
 
   private File workDir() throws IOException {
     if (ctx != null) {
-      File workDir =
-          new File(ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
+      File workDir = new File(ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
       if (workDir.exists()) {
         if (workDir.isFile())
           throw new IOException(workDir +
-                                " exists but is a file, get it out of the way");
+              " exists but is a file, get it out of the way");
         return workDir;
       } else {
         workDir.mkdirs();
@@ -43,37 +43,37 @@ class WinUpdateProcess implements Runnable {
     if (file == null)
       return;
 
-    var workingDir = workDir();
-    var logFile = new File(workingDir, "log-" + version + ".txt");
+    File workingDir = workDir();
+    File logFile = new File(workingDir, "log-" + version + ".txt");
 
-    if (logFile.canWrite()) {
-      // check if we can write to the log file. If we can, use the
-      // ProcessBuilder to run the installer.
-      ProcessBuilder pb = new ProcessBuilder(
-          file.getAbsolutePath(), "/S", "/D=" + workingDir.getAbsolutePath());
-      var env = pb.environment();
-      env.put("OLD_I2P_VERSION", version);
-      env.remove("RESTART_I2P");
+    // check if we can write to the log file. If we can, use the
+    // ProcessBuilder to run the installer.
+    ProcessBuilder pb = new ProcessBuilder(
+        file.getAbsolutePath(), "/S", "/D=" + workingDir.getAbsolutePath());
+    Map<String, String> env = pb.environment();
+    env.put("OLD_I2P_VERSION", version);
+    env.remove("RESTART_I2P");
 
-      int exitCode = ctx.router().scheduledGracefulExitCode();
-      if (exitCode == Router.EXIT_HARD_RESTART ||
-          exitCode == Router.EXIT_GRACEFUL_RESTART)
-        env.put("RESTART_I2P", "true");
+    int exitCode = ctx.router().scheduledGracefulExitCode();
+    if (exitCode == Router.EXIT_HARD_RESTART ||
+        exitCode == Router.EXIT_GRACEFUL_RESTART)
+      env.put("RESTART_I2P", "true");
 
-      try {
-        pb.directory(workingDir)
-            .redirectErrorStream(true)
-            .redirectOutput(logFile)
-            .start();
-      } catch (IOException ex) {
-        _log.error(
-            "Unable to run update-program in background. Update will fail.");
-      }
-    } else {
-      // If we cant write to the log file and we're on Windows, use the elevator
-      // to execute the installer instead of the ProcessBuilder.
-      Elevator.executeAsAdministrator(file.getAbsolutePath(),
-                                      " /S /D=" + workingDir.getAbsolutePath());
+    try {
+      Process p = pb.directory(workingDir)
+          .redirectErrorStream(true)
+          .redirectOutput(logFile)
+          .start();
+      exitCode = p.waitFor();
+      if (exitCode != 0)
+        _log.error("Update failed with exit code " + exitCode + " see " +
+            logFile.getAbsolutePath() + " for more details");
+    } catch (IOException ex) {
+      _log.error(
+          "Unable to run update program in background. Update will fail.", ex);
+    } catch (InterruptedException ex) {
+      _log.error(
+          "Unable to run update program in background. Update will fail.", ex);
     }
   }
 

java/net/i2p/router/WindowsAppUtil.java

@@ -0,0 +1,158 @@
+package net.i2p.router;
+
+import java.io.File;
+import net.i2p.util.Log;
+import net.i2p.router.RouterContext;
+
+public class WindowsAppUtil extends WindowsServiceUtil {
+  private Log _log;
+
+  public void setLog(Log log) {
+    this._log = log;
+  }
+
+  private File checkPathEnvironmentVariable(String name) {
+    String path_override = System.getenv(name);
+    if (path_override != null) {
+      File path = new File(path_override);
+      if (path != null && path.exists()) {
+        if (path.isDirectory())
+          return path.getAbsoluteFile();
+        else
+          throw new RuntimeException(name + " is not a directory: " + path);
+      }
+    }
+    return null;
+  }
+
+  protected File selectHome() { // throws Exception {
+    File i2p = checkPathEnvironmentVariable("JPACKAGE_HOME");
+    if (i2p == null)
+      i2p = appImageHome();
+    return i2p;
+  }
+
+  /**
+   * get the path to the java home, for jpackage this is related to the
+   * executable itself, which is handy to know. It's a directory called runtime,
+   * relative to the root of the app-image on each platform:
+   *
+   * Windows - Root of appimage is 1 directory above directory named runtime
+   * ./runtime
+   *
+   * Linux - Root of appimage is 2 directories above directory named runtime
+   * ./lib/runtime
+   *
+   * Mac OSX - Unknown for now
+   *
+   * @return
+   */
+  protected File javaHome() {
+    File jrehome = new File(System.getProperty("java.home"));
+    if (jrehome != null) {
+      if (jrehome.exists()) {
+        return jrehome;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * get the path to the root 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.
+   *
+   * @return the app-image root
+   */
+  protected File appImageHome() {
+    File jreHome = javaHome();
+    if (jreHome != null) {
+      switch (osName()) {
+        case "windows":
+          return jreHome.getAbsoluteFile().getParentFile();
+        case "mac":
+        case "linux":
+          return jreHome.getAbsoluteFile().getParentFile().getParentFile();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * 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 + the path to the executable
+   */
+  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 baseName + ".exe";
+        case "mac":
+        case "linux":
+          return "./bin/" + baseName;
+      }
+    }
+    return null;
+  }
+
+  /**
+   * get the path to the default config of the app-image by getting the path to
+   * java.home and the OS, and traversing up to the app-image root based on that
+   * information, then appending the config directory to the end onn a
+   * per-platform basis
+   *
+   * @return the app-image root
+   */
+  protected File appImageConfig() {
+    File aih = appImageHome();
+    if (aih == null) {
+      return null;
+    }
+    String osName = osName();
+    switch (osName) {
+      case "windows":
+        File winConfigDir = new File(aih, "config");
+        if (winConfigDir != null) {
+          if (winConfigDir.exists()) {
+            return winConfigDir;
+          }
+        }
+      case "mac":
+      case "linux":
+        File linConfigDir = new File(aih, "lib/config");
+        if (linConfigDir != null) {
+          if (linConfigDir.exists()) {
+            File cfg = new File(linConfigDir, "router.config");
+            if (cfg.canWrite())
+              return linConfigDir;
+            else {
+              String home = System.getenv("HOME");
+              if (home != null)
+                linConfigDir = new File(home,"i2p-config");
+            }
+            return linConfigDir;
+          }
+        }
+    }
+    return null;
+  }
+
+  protected String routerConfig() {
+    File appImageHomeDir = selectHome();
+    File routerConf = new File(appImageHomeDir, "router.config");
+    if (routerConf != null) {
+      if (routerConf.exists()) {
+        return routerConf.getAbsolutePath();
+      }
+    }
+    return null;
+  }
+}

java/net/i2p/router/WindowsServiceUtil.java

@@ -0,0 +1,206 @@
+package net.i2p.router;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import javax.swing.JOptionPane;
+
+/*
+ * Provides querying of Windows services in order to discover I2P Routers
+ * running as a service and avoid launching jpackaged routers redundantly.
+ * It will prompt a user to start their I2P service if one is discovered.
+ *
+ * see also:
+ * https://learn.microsoft.com/en-us/windows-server/administration/windows-commands/sc-query
+ * https://learn.microsoft.com/en-us/dotnet/api/system.serviceprocess.servicecontrollerstatus?view=dotnet-plat-ext-6.0
+ * https://stackoverflow.com/questions/10604844/how-to-verify-whether-service-exists-in-services-msc
+ * C#, API ideas only
+ * https://stackoverflow.com/questions/334471/need-a-way-to-check-status-of-windows-service-programmatically
+ * https://stackoverflow.com/questions/5388888/find-status-of-windows-service-from-java-application
+ * https://stackoverflow.com/questions/21566847/how-to-check-particular-windows-service-is-running-using
+ * https://stackoverflow.com/questions/9792051/start-windows-service-with-java
+ *
+ * There's a chance we can't tell ServiceController to do anything so if
+ * that is the case then we'll just launch services.msc and tell the user to
+ * take it from there.
+ *
+ * @author idk
+ * @since 1.9.7
+ */
+
+public class WindowsServiceUtil {
+  public WindowsServiceUtil() {
+  }
+
+  public String queryService(String serviceName) {
+    String result = "";
+    String line;
+    ProcessBuilder pb = new ProcessBuilder("sc", "query", serviceName);
+    try {
+      Process p = pb.start();
+      try {
+        p.waitFor(); // wait for process to finish then continue.
+        BufferedReader bri = new BufferedReader(new InputStreamReader(p.getInputStream()));
+        while ((line = bri.readLine()) != null) {
+          result += line;
+        }
+      } catch (InterruptedException e) {
+        System.err.println(e.toString());
+      } catch (IOException e) {
+        System.err.println(e.toString());
+      }
+    } catch (IOException e) {
+      System.err.println(e.toString());
+    }
+    return result;
+  }
+
+  public String getStatePrefix(String qResult) {
+    String statePrefix = "STATE              : ";
+    // get the first occurrence of "STATE", then find the
+    // next occurrence of of ":" after that. Count the
+    // spaces between.
+    int indexOfState = qResult.indexOf("STATE");
+    if (indexOfState >= 0) {
+      int indexOfColon = qResult.indexOf(":", indexOfState);
+      statePrefix = "STATE";
+      for (int f = indexOfState + 5; f < indexOfColon; f++) {
+        statePrefix += " ";
+      }
+      statePrefix += ": ";
+    }
+    return statePrefix;
+  }
+
+  public int getServiceStateInt(String serviceName) {
+    // String statePrefix = "STATE : ";
+    String qResult = queryService(serviceName);
+    String statePrefix = getStatePrefix(qResult);
+    // check that the temp string contains the status prefix
+    int ix = qResult.indexOf(statePrefix);
+    if (ix >= 0) {
+      // compare status number to one of the states
+      String stateStr = qResult.substring(ix + statePrefix.length(),
+          ix + statePrefix.length() + 1);
+      int state = Integer.parseInt(stateStr);
+      return state;
+    }
+    return -2;
+  }
+
+  public boolean isInstalled(String serviceName) {
+    if (getServiceState(serviceName).equals("uninstalled")) {
+      return false;
+    }
+    return true;
+  }
+
+  public boolean isStart(String serviceName) {
+    if (getServiceState(serviceName).equals("started")) {
+      return true;
+    }
+    if (getServiceState(serviceName).equals("starting")) {
+      return true;
+    }
+    if (getServiceState(serviceName).equals("resuming")) {
+      return true;
+    }
+    return false;
+  }
+
+  public boolean promptServiceStartIfAvailable(String serviceName) {
+    if (osName() != "windows") {
+      return true;
+    }
+    if (isInstalled(serviceName)) {
+      if (!isStart(serviceName)) {
+        int a;
+        String message = "It appears you have an existing I2P service installed.\n";
+        message += "However, it is not running yet. Please start it through `services.msc`.\n";
+        message += "If you click \"No\", the jpackage 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 {
+          // We can't just call `net start` or `sc start` directly, that throws
+          // a permission error. We can start services.msc though, where the
+          // user can start the service themselves. OR maybe we ask for
+          // elevation here? May need to refactor Elevator and Shell32X to
+          // achieve it though
+          ProcessBuilder pb = new ProcessBuilder("C:\\Windows\\System32\\services.msc");
+          try {
+            Process p = pb.start();
+            int exitCode = p.waitFor();
+            if (exitCode != 0) {
+              return false;
+            }
+          } catch (IOException e) {
+            return false;
+          } catch (InterruptedException e) {
+            return false;
+          }
+        }
+        return isStart(serviceName);
+      }
+      return true;
+    }
+    return true;
+  }
+
+  public String getServiceState(String serviceName) {
+    String stateString = "uninstalled";
+    int state = getServiceStateInt(serviceName);
+    switch (state) {
+      case (1): // service stopped
+        stateString = "stopped";
+        break;
+      case (2): // service starting
+        stateString = "starting";
+        break;
+      case (3): // service stopping
+        stateString = "stopping";
+        break;
+      case (4): // service started
+        stateString = "started";
+        break;
+      case (5): // service resuming from pause
+        stateString = "resuming";
+        break;
+      case (6): // service pausing
+        stateString = "pausing";
+        break;
+      case (7): // service paused
+        stateString = "paused";
+        break;
+    }
+    return stateString;
+  }
+
+  /**
+   * get the OS name(windows, mac, linux only)
+   *
+   * @return os name in lower-case, "windows" "mac" or "linux"
+   */
+  protected String osName() {
+    String osName = System.getProperty("os.name").toLowerCase();
+    if (osName.contains("windows"))
+      return "windows";
+    if (osName.contains("mac"))
+      return "mac";
+    return "linux";
+  }
+
+  public static void main(String args[]) {
+    WindowsServiceUtil wsu = new WindowsServiceUtil();
+    // when querying the I2P router service installed by the IzPack installer
+    // this is the correct call.
+    String state = wsu.getServiceState("i2p");
+    int stateInt = wsu.getServiceStateInt("i2p");
+    System.out.println("i2p state: " + state + " code: " + stateInt);
+    wsu.promptServiceStartIfAvailable("i2p");
+  }
+}

java/net/i2p/router/ZipUpdateProcess.java

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

makefiles/app-profile.mk

@@ -1,36 +0,0 @@
-app-profile: .version build/app-profile/user.js build/app-profile/prefs.js build/app-profile/chrome/userChrome.css build/app-profile/bookmarks.html build/app-profile/storage-sync.sqlite copy-app-xpi
-
-app-profile.tgz: app-profile
-#	$(eval PROFILE_VERSION := $(shell cat src/app-profile/version.txt))
-	@echo "building app-profile tarball $(PROFILE_VERSION)"
-	sh -c 'ls build/I2P && cp -rv build/I2P build/app-profile/I2P'; true
-	install -m755 src/unix/i2pconfig.sh build/app-profile/i2pconfig.sh
-	cd build && tar -czf app-profile-$(PROFILE_VERSION).tgz app-profile && cp app-profile-$(PROFILE_VERSION).tgz ../
-
-src/app-profile/user.js:
-	wget -O src/app-profile/user.js "https://github.com/arkenfox/user.js/raw/master/user.js"
-	sed -i 's|user_pref("extensions.autoDisableScopes", 15);|user_pref("extensions.autoDisableScopes", 0);|g src/app-profile/user.js
-	sed -i 's|user_pref("extensions.enabledScopes", 5);|user_pref("extensions.enabledScopes", 1);|g' src/app-profile/user.js
-	sed -i 's|user_pref("dom.security.https_only_mode", true);|user_pref("dom.security.https_only_mode", false);|g' src/app-profile/user.js
-	
-
-build/app-profile/user.js: build/app-profile src/app-profile/user.js
-	cp src/app-profile/user.js build/app-profile/user.js
-	cp src/app-profile/user-overrides.js build/app-profile/user-overrides.js
-
-build/app-profile/prefs.js: build/app-profile src/app-profile/prefs.js
-	cp src/app-profile/prefs.js build/app-profile/prefs.js
-
-build/app-profile/chrome/userChrome.css: build/app-profile/chrome src/app-profile/chrome/userChrome.css
-	cp src/app-profile/chrome/userChrome.css build/app-profile/chrome/userChrome.css
-
-build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.html
-	cp src/app-profile/bookmarks.html build/app-profile/bookmarks.html
-
-build/app-profile/storage-sync.sqlite: build/app-profile src/app-profile/storage-sync.sqlite
-	cp src/app-profile/storage-sync.sqlite build/app-profile/storage-sync.sqlite
-
-copy-app-xpi: build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions
-	cp build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "build/app-profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-	cp build/https-everywhere-eff@eff.org.xpi "build/app-profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions/i2ppb@eyedeekay.github.io.xpi

makefiles/build.mk

@@ -1,40 +0,0 @@
-build/profile/extensions: build/profile
-	mkdir -p build/profile/extensions
-
-build/profile: build
-	mkdir -p build/profile
-
-build/win:
-	mkdir -p build/win/
-
-build/win/common.bat:
-	#cp src/win/common.bat build/win/common.bat
-
-build/win/copy-config-profile.bat:
-	#cp src/win/copy-config-profile.bat build/win/copy-config-profile.bat
-
-build/win/copy-profile.bat:
-	#cp src/win/launchi2p.bat build/win/copy-profile.bat
-
-build/win/launchi2p.bat:
-	#cp src/win/launchi2p.bat build/win/launchi2p.bat
-
-build/win/i2pbrowser.bat: build/win/common.bat build/win/copy-config-profile.bat build/win/copy-profile.bat build/win/launchi2p.bat
-	#cp src/win/i2pbrowser.bat build/win/i2pbrowser.bat
-
-build/win/i2pconfig.bat: build/win/common.bat build/win/copy-config-profile.bat build/win/copy-profile.bat build/win/launchi2p.bat
-	#cp src/win/i2pconfig.bat build/win/i2pconfig.bat
-
-build/win/i2pbrowser-private.bat: build/win/common.bat build/win/copy-config-profile.bat build/win/copy-profile.bat build/win/launchi2p.bat
-	#cp src/win/i2pbrowser-private.bat build/win/i2pbrowser-private.bat
-
-launchers: build/win build/win/i2pbrowser.bat build/win/i2pbrowser-private.bat build/win/i2pconfig.bat
-
-build/app-profile/chrome: build/app-profile
-	mkdir -p build/app-profile/chrome
-	
-build/app-profile/extensions: build/app-profile
-	mkdir -p build/app-profile/extensions
-
-build/app-profile: build
-	mkdir -p build/app-profile

makefiles/debian.mk

@@ -1,55 +0,0 @@
-orig:
-	tar --exclude=debian --exclude=.git -cvzf ../i2p-firefox-profile_$(PROFILE_VERSION).orig.tar.gz .
-
-## HOWTO: If you need to release a package to launchpad, build for the oldest
-## release launchpad supports(bionic AFIACT). Then, after the build is
-## published, copy it to the other distributions. When bionic is out of date,
-## update it to the new LTS.
-
-bionic:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) bionic; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-focal:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) focal; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-groovy:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) groovy; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-buster:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) buster; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-bullseye:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) bullseye; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-trixie:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) trixie; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-sid:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) sid; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-dput:
-	dput --simulate --force ppa:i2p-community/ppa ../i2p-firefox-profile_$(PROFILE_VERSION)-1_source.changes || exit
-	dput --force ppa:i2p-community/ppa ../i2p-firefox-profile_$(PROFILE_VERSION)-1_source.changes
-
-launchpad: bionic

makefiles/docker.mk

@@ -1,12 +0,0 @@
-docker:
-	docker build -t geti2p/i2p.firefox .
-
-xhost:
-	xhost + local:docker
-
-run: docker xhost
-	docker run -it --rm \
-		--net=host \
-		-e DISPLAY=unix$(DISPLAY) \
-		-v /tmp/.X11-unix:/tmp/.X11-unix \
-		geti2p/i2p.firefox firefox --profile /src/build/profile

makefiles/extensions.mk

@@ -1,25 +0,0 @@
-
-build-extensions: extensions build/i2ppb@eyedeekay.github.io.xpi build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi
-
-build/i2ppb@eyedeekay.github.io.xpi: i2psetproxy.url
-	curl -L `cat i2psetproxy.url` > build/i2ppb@eyedeekay.github.io.xpi
-
-build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi: NoScript.url
-	curl -L `cat NoScript.url` > "build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-
-build/https-everywhere-eff@eff.org.xpi: HTTPSEverywhere.url
-	curl -L `cat HTTPSEverywhere.url` > build/https-everywhere-eff@eff.org.xpi
-
-clean-extensions:
-	rm -fv i2psetproxy.url NoScript.url HTTPSEverywhere.url build/i2ppb@eyedeekay.github.io.xpi build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi
-
-extensions: HTTPSEverywhere.url NoScript.url i2psetproxy.url
-
-HTTPSEverywhere.url:
-	@echo `./amo-version.sh https-everywhere` > HTTPSEverywhere.url
-
-NoScript.url:
-	@echo `./amo-version.sh noscript` > NoScript.url
-
-i2psetproxy.url:
-	@echo `./amo-version.sh i2p-in-private-browsing` > i2psetproxy.url

makefiles/install.mk

@@ -1,39 +0,0 @@
-install:
-	install -D -m644 src/unix/i2pbrowserrc /etc/i2pbrowser/i2pbrowserrc
-	install -D -m644 src/unix/i2pbrowserdebianrc /etc/i2pbrowser/i2pbrowserdebianrc
-	install -D -m755 build/profile/i2pbrowser.sh /usr/local/bin/i2pbrowser
-	install -D -m755 build/app-profile/i2pconfig.sh /usr/local/bin/i2pconfig
-	install -D -m755 src/unix/i2p-config-service-setup.sh /usr/local/bin/i2p-config-service-setup
-	cp -vr build/profile /var/lib/i2pbrowser/profile
-	cp -vr build/app-profile /var/lib/i2pbrowser/app-profile
-	cp -vr src/icons /var/lib/i2pbrowser/icons
-	cp src/unix/desktop/i2pbrowser.desktop /usr/share/applications
-	cp src/unix/desktop/i2pconfig.desktop /usr/share/applications
-
-uninstall:
-	rm -rfv /etc/i2pbrowser \
-		/var/lib/i2pbrowser \
-		/etc/i2pbrowser/i2pbrowserrc \
-		/usr/local/bin/i2pbrowser \
-		/usr/local/bin/i2pconfig \
-		/usr/local/bin/i2p-config-service-setup \
-		/usr/share/applications/i2pbrowser.desktop \
-		/usr/share/applications/i2pconfig.desktop
-
-checkinstall: .version
-	checkinstall \
-		--default \
-		--install=no \
-		--fstrans=yes \
-		--pkgname=i2p-firefox \
-		--pkgversion=$(PROFILE_VERSION) \
-		--pkggroup=net \
-		--pkgrelease=1 \
-		--pkgsource="https://i2pgit.org/i2p-hackers/i2p.firefox" \
-		--maintainer="$(SIGNER)" \
-		--requires="firefox,wget" \
-		--suggests="i2p,i2p-router,syndie,tor,tsocks" \
-		--nodoc \
-		--deldoc=yes \
-		--deldesc=yes \
-		--backup=no

makefiles/new-extensions.mk

@@ -1,31 +0,0 @@
-
-build-new-extensions: build/i2ppb@eyedeekay.github.io.xpi build/uBlock0@raymondhill.net.xpi build/jsr@javascriptrestrictor.xpi build/onioncbt@eyedeekay.github.io.xpi build/{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi
-
-build/uBlock0@raymondhill.net.xpi:
-	curl -L `cat UBlockOrigin.url` > build/uBlock0@raymondhill.net.xpi
-
-build/jsr@javascriptrestrictor.xpi:
-	curl -L `cat JShelter.url` > build/jsr@javascriptrestrictor.xpi
-
-build/onioncbt@eyedeekay.github.io.xpi:
-	curl -L `cat onioncontainer.url` > build/onioncbt@eyedeekay.github.io.xpi
-
-build/{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi:
-	curl -L `cat LocalCDN.url` > build//{b86e4813-687a-43e6-ab65-0bde4ab75758}.xpi
-
-UBlockOrigin.url:
-	@echo `./amo-version.sh ublock-origin` > UBlockOrigin.url
-
-JShelter.url:
-	@echo "`./amo-version.sh javascript-restrictor`" > JShelter.url
-
-onioncontainer.url:
-	@echo `./amo-version.sh onion-in-container-browsing` > onioncontainer.url
-
-LocalCDN.url:
-	@echo `./amo-version.sh localcdn-fork-of-decentraleyes` > LocalCDN.url
-
-clean-new-extensions:
-	rm -f UBlockOrigin.url JShelter.url onioncontainer.url LocalCDN.url build/i2ppb@eyedeekay.github.io.xpi build/onioncbt@eyedeekay.github.io.xpi
-
-new-extensions: UBlockOrigin.url JShelter.url onioncontainer.url LocalCDN.url

makefiles/profile.mk

@@ -1,33 +0,0 @@
-
-profile: build/profile/user.js build/profile/prefs.js build/profile/bookmarks.html build/profile/storage-sync.sqlite copy-xpi
-
-profile.tgz: .version profile
-#	$(eval PROFILE_VERSION := $(shell cat src/profile/version.txt))
-	@echo "building profile tarball $(PROFILE_VERSION)"
-	sh -c 'ls build/I2P && cp -rv build/I2P build/profile/I2P'; true
-	install -m755 src/unix/i2pbrowser.sh build/profile/i2pbrowser.sh
-	cd build && tar -czf profile-$(PROFILE_VERSION).tgz profile && cp profile-$(PROFILE_VERSION).tgz ../
-
-src/profile/user.js:
-	wget -O src/profile/user.js "https://github.com/arkenfox/user.js/raw/master/user.js"
-	sed -i 's|user_pref("extensions.autoDisableScopes", 15);|user_pref("extensions.autoDisableScopes", 0);|g src/profile/user.js
-	sed -i 's|user_pref("extensions.enabledScopes", 5);|user_pref("extensions.enabledScopes", 1);|g' src/profile/user.js
-	sed -i 's|user_pref("dom.security.https_only_mode", true);|user_pref("dom.security.https_only_mode", false);|g' src/profile/user.js
-
-build/profile/user.js: build/profile src/profile/user.js
-	cp src/profile/user.js build/profile/user.js
-	cp src/profile/user-overrides.js build/profile/user-overrides.js
-
-build/profile/prefs.js: build/profile src/profile/prefs.js
-	cp src/profile/prefs.js build/profile/prefs.js
-
-build/profile/bookmarks.html: build/profile src/profile/bookmarks.html
-	cp src/profile/bookmarks.html build/profile/bookmarks.html
-
-build/profile/storage-sync.sqlite: build/profile src/profile/storage-sync.sqlite
-	cp src/profile/storage-sync.sqlite build/profile/storage-sync.sqlite
-
-copy-xpi: build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions
-	cp build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "build/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-	cp build/https-everywhere-eff@eff.org.xpi "build/profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions/i2ppb@eyedeekay.github.io.xpi

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

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-Profile-Installer-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3
-
-su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
-	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
-	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" $(PROFILE_VERSION) $(SIGNER)
-
-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

release.sh

@@ -1,13 +0,0 @@
-#! /usr/bin/env bash
-
-SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
-cd "$SCRIPT_DIR" || exit 1
-
-. "$SCRIPT_DIR/config.sh"
-
-if [ -f config_overide.sh ]; then
-  . "$SCRIPT_DIR/config_override.sh"
-fi
-
-./unsigned.sh
-./sign.sh

showhider.css

@@ -8,3 +8,8 @@
 #hidenav {display:block; }
 #shownav:target {display: block; }
 #hidenav:target {display: none; }
+
+#donate {display:none; }
+#hidedonate {display:block; }
+#donate:target {display: block; }
+#hidedonate:target {display: none; }

src/app-profile/bookmarks.html

@@ -1,19 +0,0 @@
-<!DOCTYPE NETSCAPE-Bookmark-file-1>
-<!-- This is an automatically generated file.
-     It will be read and overwritten.
-     DO NOT EDIT! -->
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<TITLE>Bookmarks</TITLE>
-<H1>Bookmarks Menu</H1>
-
-<DL><p>
-    <DT><A HREF="place:type=6&sort=14&maxResults=10" ADD_DATE="1539649423" LAST_MODIFIED="1539649424">Recent Tags</A>
-    <HR>    <DT><A HREF="http://legwork.i2p/yacysearch.html?query=%s&verify=cacheonly&contentdom=text&nav=location%2Chosts%2Cauthors%2Cnamespace%2Ctopics%2Cfiletype%2Cprotocol%2Clanguage&startRecord=0&indexof=off&meanCount=5&resource=global&prefermaskfilter=&maximumRecords=10&timezoneOffset=0" ADD_DATE="1539652098" LAST_MODIFIED="1539652098" SHORTCUTURL="legwork.i2p">Search YaCy &#39;legwork&#39;: Search Page</A>
-    <DD>Software HTTP Freeware Home Page
-    <DT><H3 ADD_DATE="1539649419" LAST_MODIFIED="1539649423" PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Toolbar</H3>
-    <DL><p>
-        <DT><A HREF="place:sort=8&maxResults=10" ADD_DATE="1539649423" LAST_MODIFIED="1539649423">Most Visited</A>
-        <DT><A HREF="http://i2p-projekt.i2p/" ADD_DATE="1538511080" LAST_MODIFIED="1538511080">I2P Anonymous Network</A>
-        <DD>Anonymous peer-to-peer distributed communication layer built with open source tools and designed to run any traditional Internet service such as email, IRC or web hosting.
-    </DL><p>
-</DL>

src/app-profile/chrome/userChrome.css

@@ -1,26 +0,0 @@
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* only needed once */
-@namespace html url("http://www.w3.org/1999/xhtml");
-
-#PersonalToolbar, #PanelUI-Button, #PanelUI-menu-button, #star-button, #forward-button, #home-button, #bookmarks-toolbar-button, #library-button, #sidebar-button, #pocket-button, #fxa-toolbar-menu-button, #reader-mode-button, #identity-icon {
-  visibility: collapse;
-}
-
-#urlbar-background {background-color: black !important;} 
-
-/* Remove back button circle */
-#back-button:not(:hover),
-#back-button:not(:hover) > .toolbarbutton-icon {
-background: transparent !important;
-border: none !important;
-box-shadow: none !important;
-}
-
-#back-button:hover,
-#back-button:hover > .toolbarbutton-icon {
-border: none !important;
-border-radius: 2px !important;
-}
-
-#urlbar-container, #nav-bar { visibility: collapse !important }
-}   

src/app-profile/prefs.js

@@ -1,65 +0,0 @@
-user_pref("extensions.https_everywhere._observatory.enabled", false);
-user_pref("extensions.https_everywhere.options.autoUpdateRulesets", false);
-user_pref("extensions.https_everywhere.globalEnabled", false);
-user_pref("extensions.https_everywhere._observatory.submit_during_tor", false);
-user_pref("extensions.https_everywhere._observatory.submit_during_nontor", false);
-user_pref("extensions.https_everywhere._observatory.use_custom_proxy", true);
-user_pref("extensions.https_everywhere._observatory.proxy_host", "127.0.0.1");
-user_pref("extensions.https_everywhere._observatory.proxy_port", 4444);
-
-user_pref("extensions.torbutton.use_nontor_proxy", true);
-
-//For socket conversion: in the future, I'll need to make TBB communicate with
-//i2p over a unix socket. Fortunately, this is how you do that. It will be
-//configurable in a similar way to the host:port configuration when that happens.
-//user_pref("extensions.torlauncher.socks_port_use_ipc", );
-//user_pref("extensions.torlauncher.socks_ipc_path", "");
-
-user_pref("extensions.torlauncher.start_tor", false);
-//user_pref("extensions.torlauncher.default_bridge_type", "");
-user_pref("extensions.torlauncher.prompt_at_startup", false);
-
-// Resist-fingerprinting and first-party isolation enable
-
-user_pref("privacy.resistFingerprinting", true);
-user_pref("privacy.firstparty.isolate", true);
-
-// Use i2p http proxy for all connections and set homepage to safe local form.
-
-// DON'T allow access to the admin panel from the profile we browse i2p with.
-user_pref("network.proxy.no_proxies_on", "127.0.0.1:7657,localhost:7657,127.0.0.1:7662,localhost:7662,127.0.0.1:7669,localhost:7669");
-user_pref("network.proxy.type", 1);
-user_pref("network.proxy.http", "127.0.0.1");
-user_pref("network.proxy.http_port", 4444);
-user_pref("network.proxy.ssl", "127.0.0.1");
-user_pref("network.proxy.ssl_port", 4444);
-user_pref("network.proxy.ftp", "127.0.0.1");
-user_pref("network.proxy.ftp_port", 4444);
-user_pref("network.proxy.socks", "127.0.0.1");
-user_pref("network.proxy.socks_port", 4444);
-user_pref("network.proxy.share_proxy_settings", true);
-user_pref("browser.startup.homepage", "about:blank");
-user_pref("dom.security.https_only_mode", false);
-user_pref("keyword.enabled", false);
-user_pref("extensions.allowPrivateBrowsingByDefault", true);
-user_pref("extensions.PrivateBrowsing.notification", false);
-
-user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
-user_pref("extensions.pocket.enabled", false);
-user_pref("browser.newtabpage.activity-stream.showSponsoredTopSites", false);
-user_pref("browser.newtabpage.activity-stream.showSponsored", false);
-user_pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsored", false);
-user_pref("browser.newtabpage.activity-stream.feeds.section.highlights", false);
-user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false);
-user_pref("browser.newtabpage.activity-stream.default.sites", "http://127.0.0.1:7657/home,http://127.0.0.1:7657/i2psnark/,http://127.0.0.1:7657/susimail/");
-user_pref("browser.newtabpage.activity-stream.feeds.topsites", true);
-user_pref("ui.use_standins_for_native_colors", true);
-user_pref("webgl.disable-extensions", true);
-user_pref("webgl.min_capability_mode", true);
-user_pref("webgl.disable-fail-if-major-performance-caveat", true);
-user_pref("webgl.enable-webgl2", false);
-user_pref("media.navigator.enabled", false);
-user_pref("dom.w3c_touch_events.enabled", false);
-user_pref("browser.display.use_system_colors", false);
-user_pref("extensions.autoDisableScopes", 0);
-user_pref("extensions.enabledScopes", 1);

src/app-profile/user-overrides.js

@@ -1,229 +0,0 @@
-/*
-Overrides#
-for Extension Preferences# Tor Browser Bundle# Do not edit this file.##This file is modified from a file included in the Tor Browser Bundle.##Copyright 2017 The Tor Project.See LICENSE.tor#
-for licensing information.
-
-HTTPS Everywhere Preferences:
-*/
-user_pref("extensions.https_everywhere._observatory.popup_shown", true);
-user_pref("extensions.https_everywhere.toolbar_hint_shown", true);
-
-/*
-NoScript Preferences: #In order to disable all scripts by
-default, uncomment the following line...#user_pref("capability.policy.maonoscript.javascript.enabled", "noAccess");#
-and comment out the following line
-*/
-user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess");
-user_pref("capability.policy.maonoscript.sites", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
-user_pref("noscript.default", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
-user_pref("noscript.mandatory", "[System+Principal] about: about:tbupdate about:tor chrome: resource: blob: mediasource: moz-extension: moz-safe-about: about:neterror about:certerror about:feeds about:tabcrashed about:cache");
-user_pref("noscript.ABE.enabled", false);
-user_pref("noscript.ABE.notify", false);
-user_pref("noscript.ABE.wanIpAsLocal", false);
-user_pref("noscript.confirmUnblock", false);
-user_pref("noscript.contentBlocker", true);
-user_pref("noscript.firstRunRedirection", false);
-user_pref("noscript.global", true);
-user_pref("noscript.gtemp", "");
-user_pref("noscript.opacizeObject", 3);
-user_pref("noscript.forbidWebGL", true);
-user_pref("noscript.forbidFonts", true);
-user_pref("noscript.options.tabSelectedIndexes", "5,0,0");
-user_pref("noscript.policynames", "");
-user_pref("noscript.secureCookies", true);
-user_pref("noscript.showAllowPage", false);
-user_pref("noscript.showBaseDomain", false);
-user_pref("noscript.showDistrust", false);
-user_pref("noscript.showRecentlyBlocked", false);
-user_pref("noscript.showTemp", false);
-user_pref("noscript.showTempToPerm", false);
-user_pref("noscript.showUntrusted", false);
-user_pref("noscript.STS.enabled", false);
-user_pref("noscript.subscription.lastCheck", -142148139);
-user_pref("noscript.temp", "");
-user_pref("noscript.untrusted", "");
-user_pref("noscript.forbidMedia", true);
-user_pref("noscript.allowWhitelistUpdates", false);
-user_pref("noscript.fixLinks", false);
-// Now handled by plugins.click_to_play // Not in this one.
-user_pref("noscript.forbidFlash", true);
-user_pref("noscript.forbidSilverlight", true);
-user_pref("noscript.forbidJava", true);
-user_pref("noscript.forbidPlugins", true);
-// Usability tweaks
-user_pref("noscript.showPermanent", false);
-user_pref("noscript.showTempAllowPage", true);
-user_pref("noscript.showRevokeTemp", true);
-user_pref("noscript.notify", false);
-user_pref("noscript.autoReload", true);
-user_pref("noscript.autoReload.allTabs", false);
-user_pref("noscript.cascadePermissions", true);
-user_pref("noscript.restrictSubdocScripting", true);
-user_pref("noscript.showVolatilePrivatePermissionsToggle", false);
-user_pref("noscript.volatilePrivatePermissions", true);
-user_pref("noscript.clearClick", 0);
-
-user_pref("intl.locale.matchOS", false);
-
-user_pref("extensions.https_everywhere._observatory.enabled", false);
-user_pref("extensions.https_everywhere.options.autoUpdateRulesets", false);
-user_pref("extensions.https_everywhere.globalEnabled", false);
-user_pref("extensions.https_everywhere._observatory.submit_during_tor", false);
-user_pref("extensions.https_everywhere._observatory.submit_during_nontor", false);
-user_pref("extensions.https_everywhere._observatory.use_custom_proxy", true);
-user_pref("extensions.https_everywhere._observatory.proxy_host", "127.0.0.1");
-user_pref("extensions.https_everywhere._observatory.proxy_port", 4444);
-
-user_pref("extensions.torbutton.use_nontor_proxy", true);
-
-//For socket conversion: in the future, I'll need to make TBB communicate with
-//i2p over a unix socket. Fortunately, this is how you do that. It will be
-//configurable in a similar way to the host:port configuration when that happens.
-//user_pref("extensions.torlauncher.socks_port_use_ipc", );
-//user_pref("extensions.torlauncher.socks_ipc_path", "");
-
-// TODO: this is a Tor Browser specific setting which is ignored on Firefox. If
-// I make it true, the SOCKS outproxy will have something to connect to. But I
-// need to test more to find out if that's prudent.
-user_pref("extensions.torlauncher.start_tor", false);
-//user_pref("extensions.torlauncher.default_bridge_type", "");
-user_pref("extensions.torlauncher.prompt_at_startup", false);
-
-// Resist-fingerprinting and first-party isolation enable
-
-user_pref("privacy.resistFingerprinting", true);
-user_pref("privacy.firstparty.isolate", true);
-
-// Use i2p http proxy for all connections and set homepage to safe local form.
-
-// DON'T allow access to the admin panel from the profile we browse i2p with.
-user_pref("network.proxy.no_proxies_on", "127.0.0.1:7657,localhost:7657,127.0.0.1:7662,localhost:7662,127.0.0.1:7669,localhost:7669");
-user_pref("network.proxy.type", 1);
-user_pref("network.proxy.http", "127.0.0.1");
-user_pref("network.proxy.http_port", 4444);
-user_pref("network.proxy.ssl", "127.0.0.1");
-user_pref("network.proxy.ssl_port", 4444);
-user_pref("network.proxy.ftp", "127.0.0.1");
-user_pref("network.proxy.ftp_port", 4444);
-user_pref("network.proxy.socks", "127.0.0.1");
-user_pref("network.proxy.socks_port", 4444);
-user_pref("network.proxy.share_proxy_settings", true);
-user_pref("browser.startup.homepage", "http://127.0.0.1:7657/home");
-
-// Privacy-harden and disable irrelevant features.
-user_pref("app.normandy.api_url", "");
-user_pref("app.normandy.enabled", false);
-user_pref("app.update.auto", false);
-user_pref("app.update.enabled", false);
-user_pref("beacon.enabled", false);
-user_pref("browser.aboutHomeSnippets.updateUrl", "");
-user_pref("browser.cache.disk_cache_ssl", false);
-user_pref("browser.cache.disk.enable", false);
-user_pref("browser.cache.offline.enable", false);
-user_pref("browser.disableResetPrompt", true);
-user_pref("browser.display.use_document_fonts", 0);
-user_pref("browser.fixup.alternate.enabled", false);
-user_pref("browser.formfill.enable", false);
-user_pref("browser.library.activity-stream.enabled", false);
-user_pref("browser.newtabpage.activity-stream.disableSnippets", true);
-user_pref("browser.newtabpage.activity-stream.enabled", false);
-user_pref("browser.newtabpage.activity-stream.feeds.section.highlights", false);
-user_pref("browser.newtabpage.activity-stream.feeds.snippets", false);
-user_pref("browser.newtabpage.activity-stream.feeds.telemetry", false);
-user_pref("browser.newtabpage.activity-stream.feeds.topsites", false);
-user_pref("browser.newtabpage.activity-stream.prerender", false);
-user_pref("browser.newtabpage.activity-stream.showSearch", false);
-user_pref("browser.newtabpage.enhanced", false);
-user_pref("browser.newtabpage.introShown", true);
-user_pref("browser.newtab.preload", false);
-user_pref("browser.onboarding.enabled", false);
-user_pref("browser.pagethumbnails.capturing_disabled", true);
-user_pref("browser.safebrowsing.appRepURL", "");
-user_pref("browser.safebrowsing.blockedURIs.enabled", false);
-user_pref("browser.safebrowsing.downloads.enabled", false);
-user_pref("browser.safebrowsing.downloads.remote.enabled", false);
-user_pref("browser.safebrowsing.downloads.remote.url", "");
-user_pref("browser.safebrowsing.enabled", false);
-user_pref("browser.safebrowsing.malware.enabled", false);
-user_pref("browser.safebrowsing.phishing.enabled", false);
-user_pref("browser.search.geoip.timeout", 1);
-user_pref("browser.search.suggest.enabled", false);
-user_pref("browser.selfsupport.url", "");
-user_pref("browser.send_pings", false);
-user_pref("browser.shell.checkDefaultBrowser", false);
-user_pref("browser.startup.homepage_override.mstone", "ignore");
-user_pref("browser.startup.page", 0);
-user_pref("browser.toolbarbuttons.introduced.pocket-button", true);
-user_pref("browser.urlbar.speculativeConnect.enabled", false);
-user_pref("browser.urlbar.trimURLs", false);
-user_pref("datareporting.healthreport.uploadEnabled", false);
-user_pref("datareporting.policy.dataSubmissionEnabled", false);
-user_pref("dom.battery.enabled", false);
-user_pref("dom.enable_performance", false);
-user_pref("dom.enable_performance_navigation_timing", false);
-user_pref("dom.enable_resource_timing", false);
-user_pref("dom.event.clipboardevents.enabled", false);
-user_pref("dom.gamepad.enabled", false);
-user_pref("dom.indexedDB.enabled", false);
-user_pref("dom.min_timeout_value", 400);
-user_pref("dom.push.connection.enabled", false);
-user_pref("dom.push.enabled", false);
-user_pref("dom.serviceWorkers.enabled", false);
-user_pref("dom.serviceWorkers.interception.enabled", false);
-user_pref("dom.storage.enabled", false);
-user_pref("dom.webaudio.enabled", false);
-user_pref("extensions.autoDisableScopes", 0);
-user_pref("extensions.enabledScopes", 1);
-user_pref("extensions.getAddons.cache.enabled", false);
-user_pref("extensions.getAddons.showPane", false);
-user_pref("extensions.pocket.enabled", false);
-user_pref("extensions.screenshots.disabled", true);
-user_pref("extensions.webservice.discoverURL", "");
-user_pref("geo.enabled", false);
-user_pref("geo.wifi.uri", "");
-user_pref("gfx.downloadable_fonts.disable_cache", true);
-user_pref("javascript.options.shared_memory", false);
-user_pref("layout.css.visited_links_enabled", false);
-user_pref("media.autoplay.enabled", false);
-user_pref("media.cache_size", 0);
-user_pref("media.navigator.enabled", false);
-user_pref("media.peerconnection.ice.no_host", true);
-user_pref("media.video_stats.enabled", false);
-user_pref("captivedetect.canonicalURL", "");
-user_pref("network.captive-portal-service.enabled", false);
-user_pref("network.cookie.cookieBehavior", 1);
-user_pref("network.cookie.lifetimePolicy", 2);
-user_pref("network.dns.disablePrefetch", true);
-user_pref("network.http.referer.spoofSource", true);
-user_pref("network.http.referer.trimmingPolicy", 2);
-user_pref("network.http.referer.XOriginPolicy", 2);
-user_pref("network.prefetch-next", false);
-user_pref("privacy.donottrackheader.enabled", true);
-user_pref("privacy.donottrackheader.value", 1);
-user_pref("toolkit.telemetry.archive.enabled", false);
-user_pref("toolkit.telemetry.coverage.opt-out", true);
-user_pref("toolkit.telemetry.enabled", false);
-user_pref("toolkit.telemetry.server", "");
-user_pref("toolkit.telemetry.unified", false);
-user_pref("webgl.disabled", true);
-user_pref("browser.chrome.errorReporter.infoURL", "");
-user_pref("breakpad.reportURL", "");
-//user_pref("browser.newtabpage.activity-stream.default.sites", "");
-user_pref("browser.newtabpage.activity-stream.showSponsoredTopSites", false);
-user_pref("browser.newtabpage.activity-stream.showSponsored", false);
-user_pref("services.sync.prefs.sync.browser.newtabpage.activity-stream.showSponsored", false);
-user_pref("browser.newtabpage.enabled", true);
-user_pref("browser.newtabpage.activity-stream.default.sites", "http://planet.i2p/,http://legwork.i2p/,http://i2pwiki.i2p/,http://i2pforums.i2p/,http://zzz.i2p/");
-user_pref("dom.security.https_only_mode", false);
-user_pref("keyword.enabled", false);
-user_pref("extensions.allowPrivateBrowsingByDefault", true);
-user_pref("extensions.PrivateBrowsing.notification", false);
-user_pref("browser.newtabpage.activity-stream.feeds.topsites", true);
-user_pref("ui.use_standins_for_native_colors", true);
-user_pref("webgl.disable-extensions", true);
-user_pref("webgl.min_capability_mode", true);
-user_pref("webgl.disable-fail-if-major-performance-caveat", true);
-user_pref("webgl.enable-webgl2", false);
-user_pref("dom.w3c_touch_events.enabled", false);
-user_pref("browser.privatebrowsing.autostart", false);
-user_pref("browser.display.use_system_colors", false);