move config_override.sh out of the way when doing a daily

.gitignore

@@ -18,4 +18,7 @@ i2pversion_override
 *.log
 cmd
 *.so
-*.jar
+*.jar
+*.zip
+*.tar.gz
+config_override.sh

Dockerfile

@@ -1,10 +0,0 @@
-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'

LICENSE.html

@@ -17,6 +17,11 @@
       <div id="shownav">
         <div id="hidenav">
           <ul>
+            <li>
+              <a href="..">
+                Up one level ^
+              </a>
+            </li>
             <li>
               <a href="index.html">
                 index
@@ -40,12 +45,15 @@
         </div>
       </div>
     </div>
+    <a id="returnhome" href="/">
+      /
+    </a>
     <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
+      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,
@@ -56,13 +64,27 @@
       copies or substantial portions of the Software.
     </p>
     <p>
-      THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+      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

Makefile

@@ -32,23 +32,15 @@ i2pbrowser-jpackage.nsi:
 jpackage: version I2P build/I2P/config all
 
 help: version
-	@echo "I2P-Profile-Installer-$(PROFILE_VERSION)"
+	@echo "I2P-Easy-Install-Bundle-$(PROFILE_VERSION)"
 	@echo "$(SIGNER)"
 	@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
@@ -60,15 +52,14 @@ prep: #launchers build/licenses profile.tgz app-profile.tgz profile build/I2P bu
 	cp src/icons/*.ico build
 
 install.exe: #build/licenses
-	cd build && makensis i2pbrowser-installer.nsi && cp I2P-Profile-Installer-*.exe ../ && echo "built windows installer"
+	cd build && makensis i2pbrowser-installer.nsi && cp I2P-Easy-Install-Bundle-*.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
@@ -122,31 +113,17 @@ build/licenses: build
 	unix2dos build/licenses/LICENSE.txt
 
 clean:
-	rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb src/I2P/config *.su3 .version *.url make.log
+	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
 
 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`
@@ -159,7 +136,7 @@ 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
+	sh -c 'powershell Compress-Archive I2P I2P-jpackage-windows-$(I2P_VERSION).zip || zip I2P-jpackage-windows-$(I2P_VERSION).zip -r I2P'
 
 changelog:
 	head -n "$(BLANK)" changelog.txt

README.md

@@ -4,16 +4,17 @@ I2P Easy-Install Bundle for Windows(Also/formerly)I2P Browsing Profile for Firef
 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) :
+To build this, you will need the following software packages
+(all available in Debian and Ubuntu, see WSL section below):
 
 - make
 - nsis
@@ -21,6 +22,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 +41,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 `./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 +80,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 `make`.  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
@@ -172,21 +136,25 @@ you should select "Checkout as is, commit as is" and leave line-endings alone.
 
         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.
+**Prerequisites:** In addition to the other prerequisites, you will need to to have
+`make` installed with `cygwin`. If you are using this method, you cannot use the
+automated build scripts without a hack. You will need to create a file called `wsl`
+in a place that is in the path used by `git-bash.exe` sessions, with the content:
 
-TODO: Add links to the respective instructions for each of these.
+```
+#! /usr/bin/env bash
+$@
+```
+
+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.
@@ -218,16 +186,11 @@ Certificate which Windows will recognize. The current signer of the Windows
 bundle is Zlatinb. 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
 ```
 
+produces the binary.
+
 Building a signed update file
 -----------------------------
 
@@ -243,21 +206,35 @@ 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:
+**MOVED, DEPRECATION NOTICE:** Most of this functionality has been moved
+to http://git.idk.i2p/idk/i2p.plugins.firefox which is more stable,
+easier to build and use, and easier to incorporate into other
+projects.
 
-        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
+ - https://git.idk.i2p/idk/i2p.plugins.firefox/-/blob/main/docker.sh
 
-To build and run the container locally, clone this repository and run the
+Unix Support
+------------
 
-        make run
+**MOVED. DEPRECATION NOTICE:** Most of this functionality has been moved
+to http://git.idk.i2p/idk/i2p.plugins.firefox which is more stable,
+easier to build and use, and easier to incorporate into other
+projects. It is the better option for nearly every non-Windows case
+right now. You can get binary packages from:
 
-target.
+ - https://github.com/eyedeekay/i2p.plugins.firefox/releases
+
+or look at
+
+ - https://i2pgit.org/idk/i2p.plugins.firefox/-/blob/master/PACKAGES.md
+
+for instructions on how to build your own packages. These packages are
+unofficial! Although I do dogfood most of them and the `.jar` gets thorough
+testing.
+
+**The only remotely interesting Unix functionality that remains in this**
+**repository is the construction of a portable. You can use `targz.sh` to**
+**generate that.**
 
 Issues
 ------
@@ -269,11 +246,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

@@ -17,6 +17,11 @@
       <div id="shownav">
         <div id="hidenav">
           <ul>
+            <li>
+              <a href="..">
+                Up one level ^
+              </a>
+            </li>
             <li>
               <a href="index.html">
                 index
@@ -40,6 +45,9 @@
         </div>
       </div>
     </div>
+    <a id="returnhome" href="/">
+      /
+    </a>
     <h1>
       Setting up an Update Server for an I2P Bundle
     </h1>
@@ -53,7 +61,7 @@
     <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.
+      you&rsquo;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
@@ -100,6 +108,20 @@
       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 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

build.sh

@@ -16,74 +16,7 @@ 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/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 ..
+. "$SCRIPT_DIR/launcher.sh"
 
 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')
@@ -105,6 +38,9 @@ make src/I2P/config
   $JPACKAGE_OPTS \
   --resource-dir build \
   --app-content src/I2P/config \
+  --app-content src/icons/windowsUIToopie2.png \
+  --app-content src/icons/ui2pbrowser_icon.ico \
+  --icon src/icons/windowsUIToopie2.png \
   --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
 
 cp "$I2P_PKG/licenses/"* license/

changelog.txt

@@ -1,3 +1,20 @@
+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

config.sh

@@ -7,9 +7,7 @@ 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
-
-## Other potential values(NOT exhaustive):
+# to use it for Oracle OpenJDK18
 
 if [[ -n "$IS_WSL" || -n "$WSL_DISTRO_NAME" ]]; then
     PATH="/c/Program Files/Java/jdk-18.0.2/bin/:$PATH:/c/Program Files/Java/jdk-18.0.2/bin/"
@@ -25,6 +23,18 @@ if [ "${uname}" != "Linux" ]; then
     export JAVA_HOME="/c/Program Files/Java/jdk-18.0.2"
 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/"

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

daily-linux.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 .
+./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"

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
+./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"

daily.sh

@@ -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.
@@ -36,20 +33,25 @@ 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"
+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"
+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"

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)

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"

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"

exe.sh

@@ -6,6 +6,7 @@
 
 . ./config.sh
 . ./i2pversion
+./build.sh
 jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
     --verbose \
     --java-options "-Xmx512m" \
@@ -15,16 +16,9 @@ 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 build/I2P/config/certificates \
-    --app-content build/I2P/config/eepsite \
-    --app-content build/I2P/config/geoip \
-    --app-content build/I2P/config/webapps \
-    --app-content build/I2P/config/clients.config \
-    --app-content build/I2P/config/hosts.txt \
-    --app-content build/I2P/config/i2ptunnel.config \
-    --app-content build/I2P/config/jpackaged \
-    --app-content build/I2P/config/router.config \
-    --app-content build/I2P/config/wrappper.config \
+    --app-content src/I2P/config \
+    --app-content src/icons/windowsUIToopie2.png \
+    --icon src/icons/windowsUIToopie2.png \
     --input build \
     --verbose \
     --type exe \

experimental.sh

@@ -5,13 +5,11 @@ cd "$SCRIPT_DIR" || exit 1
 
 . "$SCRIPT_DIR/config.sh"
 
-if [ -f config_overide.sh ]; then
+if [ -f "$SCRIPT_DIR/config_override.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

i2pversion

@@ -2,13 +2,13 @@
 
 JNA_VERSION=5.11.0
 export JNA_VERSION=5.11.0
-I2PFIREFOX_VERSION=0.0.34
+I2PFIREFOX_VERSION=0.0.36
 export I2PFIREFOX_VERSION=0.0.36
 # Comment this out to build from an alternate branch or
 # the tip of the master branch.
 VERSIONMAJOR=1
 VERSIONMINOR=9
-VERSIONBUILD=5
+VERSIONBUILD=7
 I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
 VERSION=i2p-jpackage-1.9.4

index.html

@@ -17,6 +17,11 @@
       <div id="shownav">
         <div id="hidenav">
           <ul>
+            <li>
+              <a href="..">
+                Up one level ^
+              </a>
+            </li>
             <li>
               <a href="index.html">
                 index
@@ -40,6 +45,9 @@
         </div>
       </div>
     </div>
+    <a id="returnhome" href="/">
+      /
+    </a>
     <h1>
       I2P Easy-Install Bundle for Windows(Also/formerly)I2P Browsing Profile for Firefox
     </h1>
@@ -48,7 +56,7 @@
     </h2>
     <ul>
       <li>
-        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.
       </li>
       <li>
         Automatically configure a profile for I2P
@@ -57,7 +65,7 @@
         Automatically block-list all non-I2P local destinations
       </li>
       <li>
-        Enable first-party isolation, anti-fingerprinting, letterboxing
+        Enable first-party isolation, anti-fingerprinting, letterboxing, fusion, other privacy and security options
       </li>
       <li>
         Automatically sandbox I2P, Non-I2P, and I2P-Application cookiestores
@@ -67,7 +75,8 @@
       Build Dependencies:
     </h2>
     <p>
-      To build this, you will need the following software packages (all available in Debian) :
+      To build this, you will need the following software packages
+      (all available in Debian and Ubuntu, see WSL section below):
     </p>
     <ul>
       <li>
@@ -87,8 +96,20 @@
       </li>
     </ul>
     <p>
-      In addition, you will need the NSIS plugin “ShellExecAsUser” which you can get from the
-      <a href="https://nsis.sourceforge.io/ShellExecAsUser_plug-in" rel="nofollow">
+      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.
+    </p>
+    <p>
+      Building for Windows target from Linux is not possible unless
+      you obtain a Windows package from my github.
+    </p>
+    <p>
+      In addition, you will need the NSIS plugin &ldquo;ShellExecAsUser&rdquo; which you can get from the
+      <a href="https://nsis.sourceforge.io/ShellExecAsUser_plug-in">
         NSIS Wiki Page
       </a>
       . In order to install
@@ -97,7 +118,7 @@
         WSL
       </code>
       , you can download the:
-      <a href="https://nsis.sourceforge.io/mediawiki/images/6/68/ShellExecAsUser_amd64-Unicode.7z" rel="nofollow">
+      <a href="https://nsis.sourceforge.io/mediawiki/images/6/68/ShellExecAsUser_amd64-Unicode.7z">
         7zip release
       </a>
       and copy the content of
@@ -110,215 +131,11 @@
       </code>
       .
     </p>
-    <pre><code>cp -rv Plugins/* /usr/share/nsis/Plugins/
-</code></pre>
-    <p>
-      To build a Debian package, you’ll also need
-    </p>
-    <ul>
-      <li>
-        checkinstall
-      </li>
-    </ul>
-    <h2>
-      Preparation
-    </h2>
-    <p>
-      Before you build, run the targets
-    </p>
-    <pre><code>    make clean-extensions
-    make extensions
-</code></pre>
-    <p>
-      to update the extensions to point to their latest versions.
-    </p>
-    <h2>
-      Windows Build
-    </h2>
-    <p>
-      After installing the dependencies and completing the preparations,
-      just run
-      <code>
-        make
-      </code>
-      .  This will produce three files:
-    </p>
-    <p>
-      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
-      <em>
-        modified
-      </em>
-      Firefox without a URL bar as a router
-      console wrapper.
-      install.exe - the windows installer, which sets up shortcuts to
-      launch Firefox on Windows.
-    </p>
-    <p>
-      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
-      <code>
-        LICENSE.index
-      </code>
-      , then add the full license
-      to the
-      <code>
-        licenses
-      </code>
-      directory. Then, add the full license to the
-      <code>
-        cat
-      </code>
-      command in the
-      <code>
-        build/licenses
-      </code>
-      make target. The build/licenses
-      target is run automatically during the build process.
-    </p>
-    <h2>
-      Unix Support
-    </h2>
-    <p>
-      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
-      <code>
-        make install
-      </code>
-      target. Running
-      <code>
-        make install
-      </code>
-      requires root, and requires
-      <code>
-        make
-      </code>
-      to have been run
-      first. To install on Unix, system-wide, run:
-    </p>
-    <pre><code>    make
-    sudo make install
-</code></pre>
-    <p>
-      To run without installing them system wide, unpack the
-      <code>
-        profile*.tgz
-      </code>
-      to a location of your choice and run the
-      <code>
-        i2pbrowser.sh
-      </code>
-      script. This
-      will start a Firefox profile configured to use I2P.
-    </p>
-    <pre><code>    tar xvf profile-0.3.tgz
-    cd profile
-    ./i2pbrowser.sh
-</code></pre>
-    <p>
-      If you want to run the app-like i2pconfig browser, then follow the
-      same steps with app-profile*.tgz.
-    </p>
-    <pre><code>    tar xvf app-profile-0.3.tgz
-    cd app-profile
-    ./i2pconfig.sh
-</code></pre>
-    <p>
-      To generate a
-      <code>
-        deb
-      </code>
-      package, install the package
-      <code>
-        checkinstall
-      </code>
-      and run
-      the
-      <code>
-        make checkinstall
-      </code>
-      target after building with
-      <code>
-        make
-      </code>
-      .
-    </p>
-    <pre><code>    make
-    make checkinstall
-    sudo apt install ./i2p-firefox*.deb
-</code></pre>
-    <p>
-      If you want to set up i2pconfig to run when you start the service
-      with
-      <code>
-        sudo service i2p start
-      </code>
-      then you can run the script:
-    </p>
-    <pre><code>    /usr/local/bin/i2p-config-service-setup
+    <pre><code class="language-sh">cp -rv Plugins/* /usr/share/nsis/Plugins/
 </code></pre>
     <h2>
       Including a jpackaged I2P Router
     </h2>
-    <p>
-      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
-      <code>
-        I2P
-      </code>
-      in your
-      <code>
-        i2p.firefox
-      </code>
-      checkout.
-    </p>
-    <p>
-      Assuming a working java and jpackage environment on your Windows system, the
-      following command should generate a suitable “App Image” in a directory
-      called “I2P.”
-    </p>
-    <pre><code>    export I2P_VERSION=0.9.49
-    cp -R ../i2p.i2p/pkg-temp/lib build/lib
-    jpackage --type app-image --name I2P --app-version &#34;$I2P_VERSION&#34; \
-      --verbose \
-      --resource-dir build/lib \
-      --input build/lib --main-jar router.jar --main-class net.i2p.router.RouterLaunch
-</code></pre>
-    <p>
-      Transfer the I2P directory to the machine where you build i2p.firefox if
-      necessary, then complete the regular build instructions. If a jpackaged I2P router
-      isn’t present to use at build time, the inclusion will be skipped automatically
-      with a non-fatal warning.
-    </p>
-    <p>
-      In the near future, I’ll start providing a pre-built app image to ease the
-      build process for non-Windows users.
-    </p>
-    <h2>
-      End-to-End Windows build process using WSL
-    </h2>
-    <p>
-      <strong>
-        If you’ve already done this once, you can just use:
-      </strong>
-      <code>
-        ./build.sh &amp;&amp; wsl make
-      </code>
-      <strong>
-        in
-        <code>
-          git bash
-        </code>
-      </strong>
-      to automatically build an installer.
-    </p>
     <p>
       <strong>
         Prerequisites:
@@ -363,20 +180,159 @@
         %PATH%
       </code>
       . 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.
+      you should select &ldquo;Checkout as is, commit as is&rdquo; and leave line-endings alone.
+    </p>
+    <p>
+      The Windows build tools listed above must be installed on the Windows host machine.
+    </p>
+    <p>
+      TODO: Add links to the respective instructions for each of these.
+    </p>
+    <p>
+      <strong>
+        Note that after the dependencies are installed, this step is automated
+      </strong>
+      <strong>
+        with
+        <code>
+          ./build.sh
+        </code>
+        .
+      </strong>
+    </p>
+    <p>
+      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 &ldquo;App Image&rdquo; on
+      a Windows system and place it into a directory called
+      <code>
+        I2P
+      </code>
+      in your
+      <code>
+        i2p.firefox
+      </code>
+      checkout. Building without a jpackage is no longer supported.
+    </p>
+    <p>
+      Assuming a working java and jpackage environment on your Windows system, the
+      following command should generate a suitable &ldquo;App Image&rdquo; in a directory
+      called &ldquo;I2P.&rdquo;
+    </p>
+    <pre><code>    export I2P_VERSION=0.9.49
+    cp -R ../i2p.i2p/pkg-temp/lib build/lib
+    jpackage --type app-image --name I2P --app-version &quot;$I2P_VERSION&quot; \
+      --verbose \
+      --resource-dir build/lib \
+      --input build/lib --main-jar router.jar --main-class net.i2p.router.RouterLaunch
+</code></pre>
+    <p>
+      Transfer the I2P directory to the machine where you build i2p.firefox if
+      necessary, then complete the regular build instructions. If a jpackaged I2P router
+      isn&rsquo;t present to use at build time, the inclusion will be skipped automatically
+      with a non-fatal warning.
+    </p>
+    <p>
+      Pre-built app-images are available from my daily releases at:
+    </p>
+    <pre><code>    https://github.com/eyedeekay/i2p.plugins.firefox/releases/
+</code></pre>
+    <h2>
+      Windows Build
+    </h2>
+    <p>
+      After installing the dependencies and completing the preparations,
+      just run
+      <code>
+        make
+      </code>
+      .  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.
+    </p>
+    <p>
+      When generating a build it&rsquo;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
+      <code>
+        LICENSE.index
+      </code>
+      , then add the full license
+      to the
+      <code>
+        licenses
+      </code>
+      directory. Then, add the full license to the
+      <code>
+        cat
+      </code>
+      command in the
+      <code>
+        build/licenses
+      </code>
+      make target. The build/licenses
+      target is run automatically during the build process.
+    </p>
+    <h2>
+      End-to-End Windows build process using WSL(
+      <strong>
+        Recommended
+      </strong>
+      )
+    </h2>
+    <p>
+      <strong>
+        See
+        <code>
+          config.sh
+        </code>
+        and
+        <code>
+          i2pversion
+        </code>
+        for instructions on how to tweak
+      </strong>
+      <strong>
+        the build process. File an issue if you need help.
+      </strong>
+    </p>
+    <p>
+      <strong>
+        If you&rsquo;ve already done this once, you can just use:
+      </strong>
+      <code>
+        ./unsigned.sh
+      </code>
+      <strong>
+        in
+        <code>
+          git bash
+        </code>
+      </strong>
+      to automatically build an installer. If you
+      are using this method, you may use the
+      <code>
+        makensis
+      </code>
+      and
+      <code>
+        make
+      </code>
+      from
+      Ubuntu in WSL.
     </p>
     <ol>
       <li>
         <p>
-          <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10#manual-installation-steps" rel="nofollow">
-            Set up Windows Subsystem for Linux per Microsoft’s instructions
+          <a href="https://docs.microsoft.com/en-us/windows/wsl/install-win10#manual-installation-steps">
+            Set up Windows Subsystem for Linux per Microsoft&rsquo;s instructions
           </a>
         </p>
       </li>
       <li>
         <p>
-          <a href="https://www.microsoft.com/store/apps/9n6svws3rx71" rel="nofollow">
-            Install Ubuntu Focal per Microsoft’s instructions
+          <a href="https://www.microsoft.com/store/apps/9n6svws3rx71">
+            Install Ubuntu Focal per Microsoft&rsquo;s instructions
           </a>
         </p>
       </li>
@@ -389,7 +345,7 @@
         <p>
           Install prerequisites
           <code>
-            wsl sudo apt-get update &amp;&amp; sudo apt-get install make nsis dos2unix curl jq
+            wsl sudo apt-get update &amp;&amp; sudo apt-get install make nsis nsis-pluginapi dos2unix curl jq
           </code>
         </p>
       </li>
@@ -439,7 +395,7 @@ cd ..
       </li>
     </ol>
     <h2>
-      End-to-End Windows build process using Cygwin
+      End-to-End Windows build process using Cygwin(More difficult than WSL for now)
     </h2>
     <p>
       I highly recommend you look into the Chocolatey package manager, which makes it much
@@ -449,50 +405,36 @@ cd ..
       <strong>
         Prerequisites:
       </strong>
-      You need to have OpenJDK 14 or greater installed and configured
-      with your
+      In addition to the other prerequisites, you will need to to have
       <code>
-        %JAVA_HOME%
+        make
       </code>
-      environment variable configured and
+      installed with
       <code>
-        %JAVA_HOME%/bin
+        cygwin
       </code>
-      on
-      your
+      . If you are using this method, you cannot use the
+      automated build scripts without a hack. You will need to create a file called
       <code>
-        %PATH%
+        wsl
       </code>
-      . You need to have Apache Ant installed and configured with
+      in a place that is in the path used by
       <code>
-        %ANT_HOME%
+        git-bash.exe
       </code>
-      environment variable configured and
-      <code>
-        %ANT_HOME%/bin
-      </code>
-      on your
-      <code>
-        %PATH%
-      </code>
-      . You must have
-      WSL and git bash installed. You must have
-      <code>
-        NSIS.exe
-      </code>
-      installed and
-      <code>
-        makensis
-      </code>
-      available on your
-      <code>
-        %PATH%
-      </code>
-      . 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.
+      sessions, with the content:
     </p>
+    <pre><code>#! /usr/bin/env bash
+$@
+</code></pre>
     <p>
-      TODO: Add links to the respective instructions for each of these.
+      For our purposes, as long as everything else is set up and you&rsquo;re using git bash,
+      that is enough to make the scripts compatible with
+      <code>
+        cygwin
+      </code>
+      . Cygwin builds without
+      git bash are not likely to work.
     </p>
     <ol>
       <li>
@@ -578,7 +520,7 @@ cd ..
       <code>
         .exe
       </code>
-      file produced by NSIS, you’re almost ready to
+      file produced by NSIS, you&rsquo;re almost ready to
       do a release. As a final step, someone must sign the
       <code>
         .exe
@@ -587,15 +529,11 @@ cd ..
       Certificate which Windows will recognize. The current signer of the Windows
       bundle is Zlatinb. Standard Windows signing tools are used.
     </p>
-    <pre><code># Release Copypasta
-./clean.sh
-wsl make distclean
-wsl make clean-extensions
-wsl make extensions
-./build.sh
-wsl make
-./sign.sh
+    <pre><code class="language-sh">./release.sh
 </code></pre>
+    <p>
+      produces the binary.
+    </p>
     <h2>
       Building a signed update file
     </h2>
@@ -614,23 +552,82 @@ wsl make
       Docker Support
     </h2>
     <p>
-      You can use a Docker container to install this browser profile as well. In order
-      to do this, you can run the commands:
+      <strong>
+        MOVED, DEPRECATION NOTICE:
+      </strong>
+      Most of this functionality has been moved
+      to
+      <a href="http://git.idk.i2p/idk/i2p.plugins.firefox">
+        http://git.idk.i2p/idk/i2p.plugins.firefox
+      </a>
+      which is more stable,
+      easier to build and use, and easier to incorporate into other
+      projects.
     </p>
-    <pre><code>    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
-</code></pre>
+    <ul>
+      <li>
+        <a href="https://git.idk.i2p/idk/i2p.plugins.firefox/-/blob/main/docker.sh">
+          https://git.idk.i2p/idk/i2p.plugins.firefox/-/blob/main/docker.sh
+        </a>
+      </li>
+    </ul>
+    <h2>
+      Unix Support
+    </h2>
     <p>
-      To build and run the container locally, clone this repository and run the
+      <strong>
+        MOVED. DEPRECATION NOTICE:
+      </strong>
+      Most of this functionality has been moved
+      to
+      <a href="http://git.idk.i2p/idk/i2p.plugins.firefox">
+        http://git.idk.i2p/idk/i2p.plugins.firefox
+      </a>
+      which is more stable,
+      easier to build and use, and easier to incorporate into other
+      projects. It is the better option for nearly every non-Windows case
+      right now. You can get binary packages from:
     </p>
-    <pre><code>    make run
-</code></pre>
+    <ul>
+      <li>
+        <a href="https://github.com/eyedeekay/i2p.plugins.firefox/releases">
+          https://github.com/eyedeekay/i2p.plugins.firefox/releases
+        </a>
+      </li>
+    </ul>
     <p>
-      target.
+      or look at
+    </p>
+    <ul>
+      <li>
+        <a href="https://i2pgit.org/idk/i2p.plugins.firefox/-/blob/master/PACKAGES.md">
+          https://i2pgit.org/idk/i2p.plugins.firefox/-/blob/master/PACKAGES.md
+        </a>
+      </li>
+    </ul>
+    <p>
+      for instructions on how to build your own packages. These packages are
+      unofficial! Although I do dogfood most of them and the
+      <code>
+        .jar
+      </code>
+      gets thorough
+      testing.
+    </p>
+    <p>
+      <strong>
+        The only remotely interesting Unix functionality that remains in this
+      </strong>
+      <strong>
+        repository is the construction of a portable. You can use
+        <code>
+          targz.sh
+        </code>
+        to
+      </strong>
+      <strong>
+        generate that.
+      </strong>
     </p>
     <h2>
       Issues
@@ -638,47 +635,110 @@ wsl make
     <p>
       To report issues against this browser profile, please file issues
       at
-      <a href="https://i2pgit.org/i2p-hackers/i2p.firefox" rel="nofollow">
+      <a href="https://i2pgit.org/i2p-hackers/i2p.firefox">
         the official Gitlab
       </a>
       or the
-      <a href="https://github.com/i2p/i2p.firefox" rel="nofollow">
+      <a href="https://github.com/i2p/i2p.firefox">
         Github Mirror
       </a>
       . Issues
       pertaining to the plugins may be reported to their upstream
-      maintainers if it’s determined that our configuration is not at
+      maintainers if it&rsquo;s determined that our configuration is not at
       fault.
     </p>
+    <h2>
+      Credits
+    </h2>
     <p>
-      NoScript is developed on Github by
-      <code>
-        hackademix
-      </code>
-      and the community:
-      -
-      <a href="https://github.com/hackademix/noscript" rel="nofollow">
-        https://github.com/hackademix/noscript
-      </a>
+      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&rsquo;s merely an elaborate
+      configuration tool. A smart one, but a configuration tool nonetheless. Many thanks to the following
+      projects, developers, and communities:
     </p>
+    <h3>
+      Firefox and Chrome Extensions
+    </h3>
+    <ul>
+      <li>
+        <a href="https://noscript.net">
+          NoScript - Giorgio Maone and others
+        </a>
+      </li>
+      <li>
+        <a href="https://www.eff.org/https-everywhere">
+          HTTPS Everywhere - Electronic Frontier Foundation
+        </a>
+      </li>
+      <li>
+        <a href="https://ublockorigin.com/">
+          uBlock Origin - Raymond Gorhill and others
+        </a>
+      </li>
+      <li>
+        <a href="https://www.localcdn.org/">
+          LocalCDN - nobody and others
+        </a>
+      </li>
+      <li>
+        <a href="https://jshelter.org/">
+          jShelter - Libor Polčák and others
+        </a>
+      </li>
+    </ul>
+    <h3>
+      Firefox Configuration Modifiations
+    </h3>
+    <ul>
+      <li>
+        <a href="https://github.com/arkenfox/user.js/">
+          Arkenfox - Thorin Oakenpants and Others
+        </a>
+      </li>
+    </ul>
     <p>
-      HTTPS Everywhere is developed on Github by the EFF:
-      -
-      <a href="https://github.com/EFForg/https-everywhere" rel="nofollow">
-        https://github.com/EFForg/https-everywhere
+      You can find the license files for each of the these projects in the
+      <code>
+        src/i2p.firefox.*.profile/extensions/*
+      </code>
+      directory for Firefox, and the
+      <code>
+        src/i2p.chromium.*.profile/extensions/*.js/*
+      </code>
+      directories for Chromium within
+      the
+      <a href="https://i2pgit.org/idk/i2p.plugins.firefox">
+        <code>
+          i2p.plugins.firefox
+        </code>
       </a>
+      project.
     </p>
     <p>
       I2P in Private Browsing is developed on Gitlab and Github by idk and the community:
       -
-      <a href="https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox" rel="nofollow">
+      <a href="https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox">
         https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox
       </a>
       -
-      <a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox" rel="nofollow">
+      <a href="https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox">
         https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox
       </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

java/net/i2p/router/CopyConfigDir.java

@@ -5,55 +5,98 @@ 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 {
+public class CopyConfigDir extends WindowsServiceUtil {
+  static final Logger logger = Logger.getLogger("configlog");
 
-  public boolean copyDirectory(String baseDir, String workDir) {
+  public static void initLogger() {
+    try {
+      // This block configure the logger with handler and formatter
+      FileHandler 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 boolean copyDirectory(File baseDir, File workDir) {
+  public static boolean copyDirectory(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())
-        copyDirectory(file, new File(workDir, file.toString()));
+        if (copyDirectory(file, new File(newPath)))
+          return false;
       if (file.isFile())
-        copyFileNeverOverwrite(file, new File(workDir, file.toString()));
+        if (!copyFile(file, new File(newPath), true))
+          return false;
     }
     return true;
   }
 
-  public boolean copyConfigDirectory(File baseDir, File workDir) {
+  public static boolean copyConfigDirectory(File baseDir, File workDir) {
     for (File file : baseDir.listFiles()) {
-      System.out.println(file.getAbsolutePath());
+      // System.out.println(file.getAbsolutePath());
+      String fPath = file.getAbsolutePath().replace(
+          file.getParentFile().getAbsolutePath(), "");
+      String newPath = workDir.toString() + fPath;
       if (file.isDirectory())
-        copyDirectory(file, new File(workDir, file.toString()));
+        if (!copyConfigDirectory(file, new File(newPath)))
+          return false;
       if (file.isFile())
-        copyFileNeverOverwrite(file, new File(workDir, file.toString()));
+        if (!copyFileNeverOverwrite(
+                file,
+                new File(newPath))) // new File(workDir, file.toString())))
+          return false;
     }
     return true;
   }
 
-  public boolean copyFileNeverOverwrite(String basePath, String workPath) {
+  public static boolean copyFileNeverOverwrite(String basePath,
+                                               String workPath) {
     File baseFile = new File(basePath);
     File workFile = new File(workPath);
     return copyFileNeverOverwrite(baseFile, workFile);
   }
 
-  public boolean copyFileNeverOverwrite(File basePath, File workPath) {
+  public static boolean copyFileNeverOverwrite(File basePath, File workPath) {
     return copyFile(basePath, workPath, false);
   }
 
-  public boolean copyFile(File basePath, File workPath, boolean overWrite) {
+  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()) {
-      return false;
+      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));
@@ -70,7 +113,180 @@ public class CopyConfigDir {
       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);
+      }
+    }
+    File i2p = appImageHome();
+    logger.info("Checking for signs of life in I2P_CONFIG directory: " + i2p);
+    return i2p;
+  }
+
+  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);
+      }
+    }
+    File i2p = appImageHome();
+    logger.info("Checking for signs of life in I2P directory: " + i2p);
+    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 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 binary of the app-image root by getting the path to
+   * java.home and the OS, and traversing up to the app-image root based on that
+   * information, then getting the binary path on a per-platform basis. The path
+   * returned will be relative to the root.
+   *
+   * @return the app-image root
+   */
+  protected static String appImageExe() {
+    File aih = appImageHome();
+    if (aih != null) {
+      switch (osName()) {
+      case "windows":
+        return "I2P.exe";
+      case "mac":
+      case "linux":
+        return "./bin/I2P";
+      }
+    }
+    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 = selectHome();
+    return copyConfigDirectory(appImageConfigDir, appImageHomeDir);
+  }
+
+  protected static String routerConfig() {
+    File appImageHomeDir = selectHome();
+    File routerConf = new File(appImageHomeDir, "router.config");
+    if (routerConf != null) {
+      if (routerConf.exists()) {
+        return routerConf.getAbsolutePath();
+      }
+    }
+    return null;
+  }
+
+  /**
+   * 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/WinLauncher.java

@@ -18,7 +18,6 @@ import net.i2p.router.RouterLaunch;
 import net.i2p.update.*;
 import net.i2p.update.UpdateManager;
 import net.i2p.update.UpdatePostProcessor;
-import net.i2p.util.SystemVersion;
 
 /**
  * Launches a router from %PROGRAMFILES%/I2P using configuration data in
@@ -30,12 +29,13 @@ import net.i2p.util.SystemVersion;
  * appdata
  * router.pid - the pid of the java process.
  */
-public class WinLauncher {
-  static Logger logger = Logger.getLogger("launcherlog");
-  static FileHandler fh;
+public class WinLauncher extends CopyConfigDir {
+  static WindowsUpdatePostProcessor wupp = null;
+  private static Router i2pRouter;
 
-  public static void main(String[] args) throws Exception {
+  public static void main(String[] args) {
     setupLauncher();
+    initLogger();
     boolean privateBrowsing = false;
     boolean usabilityMode = false;
     boolean chromiumFirst = false;
@@ -88,29 +88,10 @@ public class WinLauncher {
     File programs = programFile();
     File home = homeDir();
 
-    // TODO: I want to minimize the amount of stuff I have to rely on NSIS for
-    // and if I
-    // 1. make the config directory inclusion part of the jpackage step
-    // and
-    // 2. make the launcher copy new or missing config files at launch
-    // then NSIS serves primarily as a way of providing multilanguage
-    // support in the installer. It has a higher degree of customization,
-    // but probably ceases to be necessary, I can make jpackage generate
-    // the installer, **and** I get to build every other kind of jpackage
-    // powered package.
-
-    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("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"));
     /**
      * IMPORTANT: You must set user.dir to the same directory where the
      * jpackage is intstalled, or when the launcher tries to re-run itself
@@ -118,8 +99,47 @@ public class WinLauncher {
      * to find the JVM and Runtime bundle. This broke Windows 11 installs.
      */
     System.setProperty("user.dir", programs.getAbsolutePath());
+    logger.info("\t" + System.getProperty("user.dir"));
+    logger.info("\t" + System.getProperty("i2p.dir.base"));
+    logger.info("\t" + System.getProperty("i2p.dir.config"));
+    logger.info("\t" + System.getProperty("router.pid"));
+    boolean continuerunning = promptServiceStartIfAvailable("i2p");
+    if (!continuerunning) {
+      logger.severe(
+          "Service startup failure, please start I2P service with services.msc");
+      System.exit(2);
+    } else {
+      fixServiceConfig();
+    }
+    continuerunning = promptUserInstallStartIfAvailable();
+    if (!continuerunning) {
+      logger.severe("User-install startup required.");
+      System.exit(2);
+    } else {
+      fixServiceConfig();
+    }
 
-    // wupp.i2pRouter = new Router(System.getProperties());
+    // 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);
+    }
+    i2pRouter = new Router(routerConfig(), System.getProperties());
+    if (!isInstalled("i2p")) {
+      if (i2pRouter.saveConfig("routerconsole.browser", null)) {
+        logger.info("removed routerconsole.browser config");
+      }
+      if (i2pRouter.saveConfig("routerconsole.browser",
+                               appImageExe() + " -noproxycheck")) {
+        logger.info("updated routerconsole.browser config " + appImageExe());
+      }
+    }
     logger.info("Router is configured");
 
     Thread registrationThread = new Thread(REGISTER_UPP);
@@ -128,25 +148,56 @@ public class WinLauncher {
     registrationThread.start();
 
     setNotStarting();
-    // wupp.i2pRouter.runRouter();
-    RouterLaunch.main(args);
+
+    i2pRouter.runRouter();
+  }
+
+  private static void fixServiceConfig() {
+    // If the user installed the Easy bundle before installing the
+    // regulalr bundle, then they have a config file which contains the
+    // wrong update URL. Check for it, and change it back if necessary.
+    // closes #23
+    i2pRouter = new Router(routerConfig(), System.getProperties());
+    if (isInstalled("i2p") || checkProgramFilesInstall()) {
+      String newsURL = i2pRouter.getConfigSetting("router.newsURL");
+      if (newsURL != null) {
+        if (newsURL.contains("win/beta")) {
+          logger.info(
+              "checked router.newsURL config, containes win/beta in a service install, invalid update type");
+          if (i2pRouter.saveConfig("router.newsURL", ServiceUpdaterString())) {
+            logger.info("updated routerconsole.browser config " +
+                        appImageExe());
+          }
+        }
+      }
+      String backupNewsURL = i2pRouter.getConfigSetting("router.backupNewsURL");
+      if (backupNewsURL != null) {
+        if (backupNewsURL.contains("win/beta")) {
+          logger.info(
+              "checked router.backupNewsURL config, containes win/beta in a service install, invalid update type");
+          if (i2pRouter.saveConfig("router.backupNewsURL",
+                                   ServiceBackupUpdaterString())) {
+            logger.info("updated routerconsole.browser config " +
+                        appImageExe());
+          }
+        }
+      }
+      String updateURL = i2pRouter.getConfigSetting("router.updateURL");
+      if (updateURL != null) {
+        if (updateURL.contains("i2pwinupdate.su3")) {
+          logger.info(
+              "checked router.updateURL config, containes win/beta in a service install, invalid update type");
+          if (i2pRouter.saveConfig("router.updateURL",
+                                   ServiceStaticUpdaterString())) {
+            logger.info("updated routerconsole.browser config " +
+                        appImageExe());
+          }
+        }
+      }
+    }
   }
 
   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();
-    }
-    
     File jrehome = javaHome();
     logger.info("jre home is: " + jrehome.getAbsolutePath());
     File appimagehome = appImageHome();
@@ -298,9 +349,8 @@ public class WinLauncher {
   }
 
   private static final Runnable REGISTER_UPP = () -> {
-    // first wait for the RouterContext to appear
     RouterContext ctx;
-    while ((ctx = (RouterContext)RouterContext.getCurrentContext()) == null) {
+    while ((ctx = i2pRouter.getContext()) == null) {
       sleep(1000);
     }
     // then wait for the update manager
@@ -318,161 +368,6 @@ public class WinLauncher {
     um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE);
   };
 
-  private 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 (SystemVersion.isWindows()) {
-      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();
-    }
-  }
-
-  private 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 (SystemVersion.isWindows()) {
-      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"
-   */
-  private 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
-   */
-  private 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
-   */
-  private 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 lib/config to the end.
-   *
-   * @return the app-image root
-   */
-  private 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;
-  }
-
-  /**
-   * set up the path to the log file
-   *
-   * @return
-   */
-  private static File logFile() {
-    File log = new File(selectProgramFile(), "logs");
-    if (!log.exists())
-      log.mkdirs();
-    return new File(log, "launcher.log");
-  }
-
   /**
    * sleep for 1 second
    *

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.*;
@@ -43,15 +44,15 @@ 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();
+      Map<String, String> env = pb.environment();
       env.put("OLD_I2P_VERSION", version);
       env.remove("RESTART_I2P");
 

java/net/i2p/router/WindowsServiceUtil.java

@@ -0,0 +1,279 @@
+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 static 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 static 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 static 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 static boolean isInstalled(String serviceName) {
+    if (getServiceState(serviceName).equals("uninstalled")) {
+      return false;
+    }
+    return true;
+  }
+
+  public static 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 static 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("i2p");
+      }
+      return true;
+    }
+    return true;
+  }
+
+  public static String ServiceUpdaterString() {
+    return "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/news.su3";
+  }
+  public static String ServiceBackupUpdaterString() {
+    return "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news.su3";
+  }
+  public static String ServiceStaticUpdaterString() {
+    return "http://echelon.i2p/i2p/i2pupdate.sud,http://stats.i2p/i2p/i2pupdate.sud";
+  }
+
+  public static 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 static 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 static 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 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 {
+        try {
+          String pfi = getProgramFilesInstall();
+          if (pfi != null)
+            Runtime.getRuntime().exec(pfi);
+        } catch (IOException e) {
+          return false;
+        }
+        return true;
+      }
+    }
+    return true;
+  }
+
+  public static 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 static 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[]) {
+    // when querying the I2P router service installed by the IzPack installer
+    // this is the correct call.
+    String state = getServiceState("i2p");
+    int stateInt = getServiceStateInt("i2p");
+    System.out.println("i2p state: " + state + " code: " + stateInt);
+    promptServiceStartIfAvailable("i2p");
+  }
+}

launcher.sh

@@ -0,0 +1,88 @@
+#! /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
+
+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"
+export I2P_PKG="$HERE/../i2p.i2p.jpackage-build/pkg-temp"
+export RES_DIR="$HERE/../i2p.i2p.jpackage-build/installer/resources"
+export I2P_JARS="$I2P_PKG/lib"
+export I2P_JBIGI="$HERE/../i2p.i2p.jpackage-build/installer/lib/jbigi"
+
+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 \
+  net/i2p/router/WindowsServiceUtil.java
+
+cd ..
+
+#echo "building launcher.jar"
+cd build
+"$JAVA_HOME"/bin/jar -cf launcher.jar net
+cd ..

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 +1,4 @@
 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
+## HOWTO: Don't bother. See http://i2pgit.org/idk/i2p.plugins.firefox debian jpackages.

makefiles/docker.mk

@@ -1,12 +1 @@
-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
+# DEPRECATED: see https://i2pgit.org/idk/i2p.plugins.firefox for much better replacement.

makefiles/extensions.mk

@@ -1,25 +1 @@
-
-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
+#DEPRECATED moved to i2p.plugins.firefox as "Base/Strict Mode"

makefiles/new-extensions.mk

@@ -1,31 +1 @@
-
-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
+#DEPRECATED moved to i2p.plugins.firefox as "Usability Mode"

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

msi.sh

@@ -6,6 +6,8 @@
 
 . ./config.sh
 . ./i2pversion
+
+./build.sh
 jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
     --verbose \
     --java-options "-Xmx512m" \
@@ -15,16 +17,9 @@ 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 build/I2P/config/certificates \
-    --app-content build/I2P/config/eepsite \
-    --app-content build/I2P/config/geoip \
-    --app-content build/I2P/config/webapps \
-    --app-content build/I2P/config/clients.config \
-    --app-content build/I2P/config/hosts.txt \
-    --app-content build/I2P/config/i2ptunnel.config \
-    --app-content build/I2P/config/jpackaged \
-    --app-content build/I2P/config/router.config \
-    --app-content build/I2P/config/wrappper.config \
+    --app-content src/I2P/config \
+    --app-content src/icons/windowsUIToopie2.png \
+    --icon src/icons/windowsUIToopie2.png \
     --input build \
     --verbose \
     --type msi \

release.sh

@@ -5,7 +5,7 @@ cd "$SCRIPT_DIR" || exit 1
 
 . "$SCRIPT_DIR/config.sh"
 
-if [ -f config_overide.sh ]; then
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
   . "$SCRIPT_DIR/config_override.sh"
 fi
 

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; }

sign.sh

@@ -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,9 @@ 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"
+    cp "I2P-Easy-Install-Bundle-$I2P_VERSION.exe" "I2P-Easy-Install-Bundle-$I2P_VERSION-signed.exe"
 fi

src/app-profile/chrome/userChrome.css

@@ -1,26 +1,45 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* only needed once */
 
-@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;
+#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;
 }
 
-#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: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;
+#back-button:hover>.toolbarbutton-icon {
+    border: none !important;
+    border-radius: 2px !important;
 }
 
-#urlbar-container, #nav-bar { visibility: collapse !important }
-}   
+#urlbar-container,
+#nav-bar {
+    visibility: collapse !important
+}

src/app-profile/version.txt

@@ -1 +1 @@
-1.9.5
+1.9.7

src/nsis/i2pbrowser-installer.nsi

@@ -3,8 +3,7 @@ UniCode true
 
 !define APPNAME "I2PBrowser-Launcher"
 !define COMPANYNAME "I2P"
-!define DESCRIPTION "This launches Firefox with a browser profile pre-configured to use i2p"
-!define FIREFOX_MESSAGE "Could not find Firefox.  Please point to where you have installed Firefox.  If you have not installed Firefox yet, exit this installer and install Firefox, then start this installer again."
+!define DESCRIPTION "This is a tool which contains an I2P router, a bundled JVM, and a tool for automatically configuring a browser to use with I2P."
 !define I2P_MESSAGE "Could not find I2P. Installing portable Jpackaged I2P."
 !define LAUNCH_TEXT "Start I2P?"
 !define LICENSE_TITLE "Many Licenses"
@@ -30,7 +29,7 @@ LicenseData "licenses\LICENSE.txt"
 # This will be in the installer/uninstaller's title bar
 Name "${COMPANYNAME} - ${APPNAME}"
 Icon ui2pbrowser_icon.ico
-OutFile "I2P-Profile-Installer-${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}.exe"
+OutFile "I2P-Easy-Install-Bundle-${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}.exe"
 
 RequestExecutionLevel user
 
@@ -128,8 +127,6 @@ PageEx directory
 PageExEnd
 Page instfiles
 
-#!include i2pbrowser-mozcompat.nsi
-
 Function .onInit
     StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}"
     UserInfo::GetAccountType
@@ -146,13 +143,14 @@ FunctionEnd
 Function routerDetect
     createDirectory $I2PINSTEXE
     SetOutPath $I2PINSTEXE\app
-    File /nonfatal /a /r "I2P\app\"
+    File /a /r "I2P\app\"
     SetOutPath $I2PINSTEXE\runtime
-    File /nonfatal /a /r "I2P\runtime\"
+    File /a /r "I2P\runtime\"
     SetOutPath $I2PINSTEXE
-    File /nonfatal /a /r "I2P\I2P.exe"
-    File /nonfatal /a /r "I2P\I2P.ico"
-    File /nonfatal "I2P\config\jpackaged"
+    File /a /r "I2P\I2P.exe"
+    # The NSIS Installer uses an ico icon, the jpackage-only ones use png
+    File /a /r "I2P\ui2pbrowser_icon.ico"
+    File "I2P\config\jpackaged"
 
     createDirectory "$I2PINSTEXE\"
     SetOutPath "$I2PINSTEXE\"
@@ -213,16 +211,6 @@ Function installerFunction
     SetOutPath "$INSTDIR\licenses"
     File /a /r "licenses/*"
 
-    # Install the profile
-    createDirectory "$INSTDIR\firefox.profile.i2p"
-    SetOutPath "$INSTDIR\firefox.profile.i2p"
-    File /a /r "profile/*"
-
-    # Install the config profile
-    createDirectory "$INSTDIR\firefox.profile.config.i2p"
-    SetOutPath "$INSTDIR\firefox.profile.config.i2p"
-    File /a /r "app-profile/*"
-
     SetOutPath "$I2PINSTEXE"
     createDirectory "$SMPROGRAMS\${APPNAME}"
     CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P.lnk" "$I2PINSTEXE\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
@@ -233,19 +221,6 @@ Function installerFunction
     SetOutPath "$INSTDIR"
 
     SetShellVarContext current
-    Var /Global I2PAPPDATA 
-
-    IfFileExists "$I2PINSTEXE\clients.config" 0 +2
-        StrCpy $I2PAPPDATA "$I2PINSTEXE"
-    IfFileExists "$APPDATA\I2P\clients.config.d" 0 +2
-        StrCpy $I2PAPPDATA "$APPDATA\I2P\"
-    IfFileExists "$LOCALAPPDATA\I2P\clients.config.d" 0 +2
-        StrCpy $I2PAPPDATA "$LOCALAPPDATA\I2P\"
-    IfFileExists "$LOCALAPPDATA\I2P\clients.config" 0 +2
-        StrCpy $I2PAPPDATA "$LOCALAPPDATA\I2P\"
-
-    createDirectory "$I2PAPPDATA"
-    SetOutPath "$I2PAPPDATA"
 
     IfFileExists "$LOCALAPPDATA\I2P\eepsite\docroot" +2 0
         File  /a /r "I2P\eepsite"

src/nsis/i2pbrowser-jpackage.nsi

@@ -1 +1 @@
-!define I2P_VERSION 1.9.5
+!define I2P_VERSION 1.9.7

src/nsis/i2pbrowser-mozcompat.nsi

@@ -1,37 +0,0 @@
-; 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/.
-
-; Returns 1 in $0 if we should install the 64-bit build, or 0 if not.
-; The requirements for selecting the 64-bit build to install are:
-; 1) Running a 64-bit OS (we've already checked the OS version).
-; 2) An amount of RAM strictly greater than RAM_NEEDED_FOR_64BIT
-; 3) No third-party products installed that cause issues with the 64-bit build.
-;    Currently this includes Lenovo OneKey Theater and Lenovo Energy Management.
-Function ShouldInstall64Bit
-    StrCpy $0 0
-
-    ${IfNot} ${RunningX64}
-    Return
-    ${EndIf}
-
-    System::Call "*(i 64, i, l 0, l, l, l, l, l, l)p.r1"
-    System::Call "Kernel32::GlobalMemoryStatusEx(p r1)"
-    System::Call "*$1(i, i, l.r2, l, l, l, l, l, l)"
-    System::Free $1
-    ${If} $2 L<= ${RAM_NEEDED_FOR_64BIT}
-    Return
-    ${EndIf}
-
-    ; Lenovo OneKey Theater can theoretically be in a directory other than this
-    ; one, because some installer versions let you change it, but it's unlikely.
-    ${If} ${FileExists} "$PROGRAMFILES32\Lenovo\Onekey Theater\windowsapihookdll64.dll"
-    Return
-    ${EndIf}
-
-    ${If} ${FileExists} "$PROGRAMFILES32\Lenovo\Energy Management\Energy Management.exe"
-    Return
-    ${EndIf}
-
-    StrCpy $0 1
-FunctionEnd

src/nsis/i2pbrowser-strrep.nsh

@@ -1,71 +0,0 @@
-
-;;
-;; TODO: Examine licensing for this function.
-;;https://nsis.sourceforge.io/StrRep
-
-!define StrRep "!insertmacro StrRep"
-!macro StrRep output string old new
-    Push `${string}`
-    Push `${old}`
-    Push `${new}`
-    !ifdef __UNINSTALL__
-        Call un.StrRep
-    !else
-        Call StrRep
-    !endif
-    Pop ${output}
-!macroend
-
-!macro Func_StrRep un
-    Function ${un}StrRep
-        Exch $R2 ;new
-        Exch 1
-        Exch $R1 ;old
-        Exch 2
-        Exch $R0 ;string
-        Push $R3
-        Push $R4
-        Push $R5
-        Push $R6
-        Push $R7
-        Push $R8
-        Push $R9
-
-        StrCpy $R3 0
-        StrLen $R4 $R1
-        StrLen $R6 $R0
-        StrLen $R9 $R2
-        loop:
-            StrCpy $R5 $R0 $R4 $R3
-            StrCmp $R5 $R1 found
-            StrCmp $R3 $R6 done
-            IntOp $R3 $R3 + 1 ;move offset by 1 to check the next character
-            Goto loop
-        found:
-            StrCpy $R5 $R0 $R3
-            IntOp $R8 $R3 + $R4
-            StrCpy $R7 $R0 "" $R8
-            StrCpy $R0 $R5$R2$R7
-            StrLen $R6 $R0
-            IntOp $R3 $R3 + $R9 ;move offset by length of the replacement string
-            Goto loop
-        done:
-
-        Pop $R9
-        Pop $R8
-        Pop $R7
-        Pop $R6
-        Pop $R5
-        Pop $R4
-        Pop $R3
-        Push $R0
-        Push $R1
-        Pop $R0
-        Pop $R1
-        Pop $R0
-        Pop $R2
-        Exch $R1
-    FunctionEnd
-!macroend
-!insertmacro Func_StrRep ""
-!insertmacro Func_StrRep "un."

src/nsis/i2pbrowser-version.nsi

@@ -1,3 +1,3 @@
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 9
-!define VERSIONBUILD 5
+!define VERSIONBUILD 7

src/profile/version.txt

@@ -1 +1 @@
-1.9.5
+1.9.7

style.css

@@ -153,5 +153,12 @@ input {
 
 #navbar {
 	float: right;
-	width: 10%;
+	width: 15%;
+}
+#returnhome {
+    font-size: xxx-large;
+    display: inline;
+}
+h1 {
+    display: inline;
 }

targz.sh

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

unsigned.sh

@@ -5,13 +5,11 @@ cd "$SCRIPT_DIR" || exit 1
 
 . "$SCRIPT_DIR/config.sh"
 
-if [ -f config_overide.sh ]; then
+if [ -f "$SCRIPT_DIR/config_override.sh" ]; then
   . "$SCRIPT_DIR/config_override.sh"
 fi
 
 ./clean.sh
 wsl make distclean
-wsl make clean-extensions
-wsl make extensions
 ./build.sh
 wsl make