more GOALS

.gitignore

@@ -20,4 +20,5 @@ cmd
 *.so
 *.jar
 *.zip
-*.tar.gz
+*.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'

GOALS.md

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

Makefile

@@ -22,9 +22,9 @@ version:
 	rm -f version.txt
 	make version.txt i2pbrowser-jpackage.nsi
 
-version.txt:
-	echo "$(PROFILE_VERSION)" > src/profile/version.txt
-	echo "$(PROFILE_VERSION)" > src/app-profile/version.txt
+version.txt: build
+	echo "$(PROFILE_VERSION)" > build/version.txt
+	echo "$(PROFILE_VERSION)" > build/version.txt
 
 i2pbrowser-jpackage.nsi:
 	echo "!define I2P_VERSION $(PROFILE_VERSION)" > src/nsis/i2pbrowser-jpackage.nsi
@@ -38,25 +38,17 @@ help: 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
+prep:
 	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
+	echo "licenses" >>make.log
 	make build/I2P
-	echo "buildi2p" >make.log
+	echo "buildi2p" >>make.log
 	make build/I2P/config
-	echo "buildi2pconfig" >make.log
+	echo "buildi2pconfig" >>make.log
 	cp src/nsis/*.nsi build
-	echo "nsi1" >make.log
+	echo "nsi1" >>make.log
 	cp src/nsis/*.nsh build
-	echo "nsi2" >make.log
+	echo "nsi2" >>make.log
 	cp src/icons/*.ico build
 
 install.exe: #build/licenses
@@ -66,9 +58,8 @@ 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
@@ -81,7 +72,6 @@ build/I2P: I2P build
 src/I2P/config:
 	mkdir -p src/I2P/config
 	rm -rf src/I2P/config/geoip src/I2P/config/webapps src/I2P/config/certificates
-	echo true | tee src/I2P/config/jpackaged
 	cp -v $(RES_DIR)/clients.config src/I2P/config/
 	cp -v $(RES_DIR)/wrapper.config src/I2P/config/
 	#grep -v 'router.updateURL' $(RES_DIR)/router.config > src/I2P/config/router.config
@@ -129,24 +119,10 @@ 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`

PRINCIPLES.md

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

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 and Ubuntu, see WSL section below) :
+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)
@@ -41,6 +52,8 @@ Cygwin installed. You must have `NSIS.exe` installed and `makensis` available on
 `%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**
@@ -101,7 +114,7 @@ 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
@@ -194,7 +207,7 @@ Docker Support
 --------------
 
 **MOVED, DEPRECATION NOTICE:** Most of this functionality has been moved
-to http://git.idk.i2p/idk/i2p.plugins.native which is more stable,
+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.
 
@@ -204,7 +217,7 @@ Unix Support
 ------------
 
 **MOVED. DEPRECATION NOTICE:** Most of this functionality has been moved
-to http://git.idk.i2p/idk/i2p.plugins.native which is more stable,
+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:
@@ -221,7 +234,8 @@ 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.**
+**generate that. Once generated, `cd I2P && ./lib/torbrowser.sh` to complete**
+**setup, and `./bin/I2P` to run it.**
 
 Issues
 ------

build.sh

@@ -16,79 +16,31 @@ 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"
+if [ -z $machine ]; then
+  unameOut="$(uname -s)"
+  case "${unameOut}" in
+      Linux*)     machine=Linux;;
+      Darwin*)    machine=Mac;;
+      *)          machine="UNKNOWN:${unameOut}"
+  esac
 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"
+if [ "$machine" = "Mac" ]; then
+  rm -rf I2P
+  ./getprebuilt.sh
+  exit 0
+elif [ "$machine" = "Linux" ]; then
+  rm -rf I2P
+  ./getprebuilt.sh
+  exit 0
 fi
 
-if [ ! -f "$HERE/build/jna-platform.jar" ]; then
-  wget -O "$HERE/build/jna-platform.jar" "https://repo1.maven.org/maven2/net/java/dev/jna/jna-platform/$JNA_VERSION/jna-platform-$JNA_VERSION.jar"
-fi
-
-if [ ! -f "$HERE/build/i2pfirefox.jar" ]; then
-  wget -O "$HERE/build/i2pfirefox.jar" "https://github.com/eyedeekay/i2p.plugins.firefox/releases/download/$I2PFIREFOX_VERSION/i2pfirefox.jar"
-fi
-
-cd java
-"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/i2pfirefox.jar:$HERE/build/jna.jar":"$HERE/build/jna-platform.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar" \
-  net/i2p/router/CopyConfigDir.java \
-  net/i2p/router/Elevator.java \
-  net/i2p/router/Shell32X.java \
-  net/i2p/router/WinLauncher.java \
-  net/i2p/router/WindowsUpdatePostProcessor.java \
-  net/i2p/router/WinUpdateProcess.java
-
-cd ..
-
-#echo "building launcher.jar"
-cd build
-"$JAVA_HOME"/bin/jar -cf launcher.jar net
-cd ..
+. "$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')
 fi
+
 echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
 
 rm -rf I2P
@@ -106,6 +58,10 @@ make src/I2P/config
   $JPACKAGE_OPTS \
   --resource-dir build \
   --app-content src/I2P/config \
+  --app-content src/unix/torbrowser.sh \
+  --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,11 @@
+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.

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

@@ -36,12 +36,12 @@ fi
 TODAYSDATE=$(date +%Y%m%d)
 
 if [ -z "$DESCRIPTION" ]; then
-  DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE"
-  DESCRIPTION+="==================================================="
-  DESCRIPTION+=""
-  DESCRIPTION+="These builds are automatically built on a daily basis and may have serious bugs."
-  DESCRIPTION+="They are intended for testing purposes only, use them at your own risk."
-  DESCRIPTION+=""
+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"

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,16 +33,17 @@ fi
 TODAYSDATE=$(date +%Y%m%d)
 
 if [ -z "$DESCRIPTION" ]; then
-  DESCRIPTION="Daily unsigned build of i2p.firefox for $TODAYSDATE"
-  DESCRIPTION+="==================================================="
-  DESCRIPTION+=""
-  DESCRIPTION+="These builds are automatically built on a daily basis and may have serious bugs."
-  DESCRIPTION+="They are intended for testing purposes only, use them at your own risk."
-  DESCRIPTION+=""
+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 "$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"

debian/README.Debian

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

debian/changelog

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

debian/control

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

debian/copyright

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

debian/files

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

debian/i2p-firefox-profile-docs.docs

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

debian/install

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

debian/rules

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

debian/source/format

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

description-pak

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

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

@@ -17,6 +17,8 @@ jpackage --name I2P-EXE --app-version "$I2P_VERSION" \
     --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
     $JPACKAGE_OPTS \
     --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

getprebuilt.sh

@@ -0,0 +1,25 @@
+#! /usr/bin/env bash
+set -e 
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f config_overide.sh ]; then
+  . "$SCRIPT_DIR/config_override.sh"
+fi
+
+. "$HOME/github-release-config.sh"
+
+TODAYSDATE=$(date -d '-1 day' '+%Y%m%d')
+
+echo github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE"
+github-release download -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "I2P.zip" -t "$TODAYSDATE"
+unzip I2P.zip

i2pversion

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

index.html

@@ -56,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
@@ -65,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
@@ -75,7 +75,8 @@
       Build Dependencies:
     </h2>
     <p>
-      To build this, you will need the following software packages (all available in Debian and Ubuntu, see WSL section below) :
+      To build this, you will need the following software packages
+      (all available in Debian and Ubuntu, see WSL section below):
     </p>
     <ul>
       <li>
@@ -94,6 +95,18 @@
         jq
       </li>
     </ul>
+    <p>
+      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">
@@ -169,6 +182,9 @@
       . You must have Git for Windows installed. When installing git for Windows,
       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>
@@ -329,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>
@@ -541,8 +557,8 @@ cd ..
       </strong>
       Most of this functionality has been moved
       to
-      <a href="http://git.idk.i2p/idk/i2p.plugins.native">
-        http://git.idk.i2p/idk/i2p.plugins.native
+      <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
@@ -564,8 +580,8 @@ cd ..
       </strong>
       Most of this functionality has been moved
       to
-      <a href="http://git.idk.i2p/idk/i2p.plugins.native">
-        http://git.idk.i2p/idk/i2p.plugins.native
+      <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

java/net/i2p/router/CopyConfigDir.java

@@ -12,7 +12,7 @@ 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 static void initLogger() {
@@ -46,7 +46,7 @@ public class CopyConfigDir {
         if (copyDirectory(file, new File(newPath)))
           return false;
       if (file.isFile())
-        if (!copyFile(file, new File(newPath), true))
+        if (0 == copyFile(file, new File(newPath), true))
           return false;
     }
     return true;
@@ -61,37 +61,49 @@ public class CopyConfigDir {
       if (file.isDirectory())
         if (!copyConfigDirectory(file, new File(newPath)))
           return false;
-      if (file.isFile())
-        if (!copyFileNeverOverwrite(
-                file,
-                new File(newPath))) // new File(workDir, file.toString())))
+      if (file.isFile()) {
+        int cnr = copyFileNeverOverwrite(file, new File(newPath));
+        if (0 == cnr)
           return false;
+        if (1 == cnr) {
+          logger.info("using jpackaged configs in a jpackaged install, creating jpackaged file");
+          File jpackagedConfigsInUse = new File(appImageHome(), "jpackaged");
+          if (!jpackagedConfigsInUse.exists()){
+            try{
+              jpackagedConfigsInUse.createNewFile();
+            }catch(IOException e){
+              logger.warning("Error creating jpackaged file, delete config files manually when uninstalling");
+            }
+          }
+        }
+        if (-1 == cnr) {
+          logger.info("not overwriting existing config file, not creating jpackaged file");
+        }
+      }
     }
     return true;
   }
 
-  public static boolean copyFileNeverOverwrite(String basePath,
-                                               String workPath) {
+  public static int copyFileNeverOverwrite(String basePath, String workPath) {
     File baseFile = new File(basePath);
     File workFile = new File(workPath);
     return copyFileNeverOverwrite(baseFile, workFile);
   }
 
-  public static boolean copyFileNeverOverwrite(File basePath, File workPath) {
+  public static int copyFileNeverOverwrite(File basePath, File workPath) {
     return copyFile(basePath, workPath, false);
   }
 
-  public static boolean copyFile(File basePath, File workPath,
-                                 boolean overWrite) {
+  public static int copyFile(File basePath, File workPath, boolean overWrite) {
     if (!basePath.exists()) {
       logger.info(basePath.getAbsolutePath() + " doesn't exist, not copying");
-      return false;
+      return 0;
     }
 
     if (!overWrite && workPath.exists()) {
       logger.info(workPath.getAbsolutePath() +
                   " already exists, not overwriting");
-      return true;
+      return -1;
     }
 
     File workDir = workPath.getParentFile();
@@ -111,12 +123,12 @@ public class CopyConfigDir {
       }
       in.close();
       out.close();
-      return true;
+      return 1;
     } catch (Throwable e) {
       logger.warning(e.toString());
       logger.warning("failed to copy " + basePath.getAbsolutePath() + " to " +
                      workPath.getAbsolutePath());
-      return false;
+      return 0;
     }
   }
 
@@ -152,20 +164,6 @@ public class CopyConfigDir {
     return i2p;
   }
 
-  /**
-   * get the OS name(windows, mac, linux only)
-   *
-   * @return os name in lower-case, "windows" "mac" or  "linux"
-   */
-  protected static String osName() {
-    String osName = System.getProperty("os.name").toLowerCase();
-    if (osName.contains("windows"))
-      return "windows";
-    if (osName.contains("mac"))
-      return "mac";
-    return "linux";
-  }
-
   /**
    * get the path to the java home, for jpackage this is related to the
    * executable itself, which is handy to know. It's a directory called runtime,

java/net/i2p/router/WinLauncher.java

@@ -33,10 +33,10 @@ 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;
+    int privateBrowsing = 0;
     boolean usabilityMode = false;
     boolean chromiumFirst = false;
     int proxyTimeoutTime = 200;
@@ -46,7 +46,7 @@ public class WinLauncher extends CopyConfigDir {
       if (args.length > 0) {
         for (String arg : args) {
           if (arg.equals("-private")) {
-            privateBrowsing = true;
+            privateBrowsing = 1;
             logger.info(
                 "Private browsing is true, profile will be discarded at end of session.");
           } else if (arg.equals("-chromium")) {
@@ -88,13 +88,6 @@ public class WinLauncher extends CopyConfigDir {
     File programs = programFile();
     File home = homeDir();
 
-    // This actually does most of what we use NSIS for if NSIS hasn't
-    // already done it, which essentially makes this whole thing portable.
-    if (!copyConfigDir()) {
-      logger.severe("Cannot copy the configuration directory");
-      System.exit(1);
-    }
-
     System.setProperty("i2p.dir.base", programs.getAbsolutePath());
     System.setProperty("i2p.dir.config", home.getAbsolutePath());
     System.setProperty("router.pid",
@@ -110,17 +103,42 @@ public class WinLauncher extends CopyConfigDir {
     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();
+    }
+
+    // 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 (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());
+    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");
 
@@ -134,6 +152,62 @@ public class WinLauncher extends CopyConfigDir {
     i2pRouter.runRouter();
   }
 
+  private static void fixServiceConfig() {
+    if (osName() != "windows")
+      return;
+    // If the user installed the Easy bundle before installing the
+    // IzPack installer, then they have a config file which contains the
+    // wrong update URL. Check for it, and change it back if necessary.
+    // closes #23
+    String routerconf = routerConfig();
+    if (routerconf != null) {
+      File routerconffile = new File(routerconf);
+      if (!routerconffile.exists()) {
+        return;
+      }
+    } else {
+      return;
+    }
+    if (isInstalled("i2p") || checkProgramFilesInstall()) {
+      i2pRouter = new Router(routerconf, System.getProperties());
+      String newsURL = i2pRouter.getConfigSetting("router.newsURL");
+      if (newsURL != null) {
+        if (newsURL.contains("http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/win/beta/news.su3")) {
+          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("http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/win/beta/news.su3")) {
+          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("http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3")) {
+          logger.info(
+              "checked router.updateURL config, containes easy-intall update in a service install, invalid update type");
+          if (i2pRouter.saveConfig("router.updateURL",
+                                   ServiceStaticUpdaterString())) {
+            logger.info("updated routerconsole.browser config " +
+                        appImageExe());
+          }
+        }
+      }
+    }
+  }
+
   private static void setupLauncher() {
     File jrehome = javaHome();
     logger.info("jre home is: " + jrehome.getAbsolutePath());
@@ -167,7 +241,7 @@ public class WinLauncher extends CopyConfigDir {
     return home;
   }
 
-  private static boolean launchBrowser(boolean privateBrowsing,
+  private static boolean launchBrowser(int privateBrowsing,
                                        boolean usabilityMode,
                                        boolean chromiumFirst,
                                        int proxyTimeoutTime,

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,89 @@
+#! /usr/bin/env bash
+set -e 
+
+SCRIPT_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd -P)
+cd "$SCRIPT_DIR" || exit 1
+
+. "$SCRIPT_DIR/i2pversion"
+
+if [ -f i2pversion_override ]; then
+    . "$SCRIPT_DIR/i2pversion_override"
+fi
+
+. "$SCRIPT_DIR/config.sh"
+
+if [ -f "$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 --depth=1 -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/"
+git pull --all
+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,14 +0,0 @@
-app-profile: .version build/app-profile/chrome/userChrome.css build/app-profile/storage-sync.sqlite
-
-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 ../
-
-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/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

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/install.mk

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

makefiles/profile.mk

@@ -1,12 +0,0 @@
-
-profile: .version build/profile/storage-sync.sqlite
-
-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 ../
-
-build/profile/storage-sync.sqlite: build/profile src/profile/storage-sync.sqlite
-	cp src/profile/storage-sync.sqlite build/profile/storage-sync.sqlite

msi.sh

@@ -18,6 +18,8 @@ jpackage --name I2P-MSI --app-version "$I2P_VERSION" \
     --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
     $JPACKAGE_OPTS \
     --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
 

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
 

src/app-profile/bookmarks.html

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

src/app-profile/chrome/userChrome.css

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

src/app-profile/prefs.js

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

src/app-profile/user-overrides.js

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

src/app-profile/version.txt

@@ -1 +0,0 @@
-1.9.6

src/nsis/i2pbrowser-installer.nsi

@@ -4,7 +4,7 @@ UniCode true
 !define APPNAME "I2PBrowser-Launcher"
 !define COMPANYNAME "I2P"
 !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 I2P_MESSAGE "Please choose a directory."
 !define LAUNCH_TEXT "Start I2P?"
 !define LICENSE_TITLE "Many Licenses"
 !define CONSOLE_URL "http://127.0.0.1:7657/home"
@@ -13,12 +13,12 @@ UniCode true
 !include i2pbrowser-jpackage.nsi
 !include FindProcess.nsh
 
-var I2PINSTEXE
+#var INSTDIR
 
 SetOverwrite on
 
-!define I2PINSTEXE
-!define I2PINSTEXE_USERMODE "$LOCALAPPDATA\i2p"
+!define INSTDIR
+!define I2PINSTEXE_USERMODE "$LOCALAPPDATA\i2peasy"
 
 !define RAM_NEEDED_FOR_64BIT 0x80000000
 
@@ -122,18 +122,20 @@ PageEx license
 PageExEnd
 PageEx directory
     dirtext "${I2P_MESSAGE}"
-    dirvar $I2PINSTEXE
+    dirvar $INSTDIR
     PageCallbacks routerDetect
 PageExEnd
 Page instfiles
 
 Function .onInit
-    StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}"
+    # Note: This is all redundant and I know it.
+    # Admin installs have been migrated to user-mode installs.
+    # But I'm leaving it because I might need it again if I support service installs.
+    StrCpy $INSTDIR "${I2PINSTEXE_USERMODE}"
     UserInfo::GetAccountType
     pop $0
     ${If} $0 != "admin"
-        StrCpy $INSTDIR "$LOCALAPPDATA\${COMPANYNAME}\${APPNAME}"
-        StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}"
+        StrCpy $INSTDIR "${I2PINSTEXE_USERMODE}"
     ${EndIf}
     !insertmacro MUI_LANGDLL_DISPLAY
     #Call ShouldInstall64Bit
@@ -141,33 +143,22 @@ Function .onInit
 FunctionEnd
 
 Function routerDetect
-    createDirectory $I2PINSTEXE
-    SetOutPath $I2PINSTEXE\app
-    File /nonfatal /a /r "I2P\app\"
-    SetOutPath $I2PINSTEXE\runtime
-    File /nonfatal /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"
+    createDirectory $INSTDIR
+    SetOutPath $INSTDIR\app
+    File /a /r "I2P\app\"
+    SetOutPath $INSTDIR\runtime
+    File /a /r "I2P\runtime\"
+    SetOutPath $INSTDIR\config
+    File /a /r "I2P\config\"
+    SetOutPath $INSTDIR
+    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"
 
-    createDirectory "$I2PINSTEXE\"
-    SetOutPath "$I2PINSTEXE\"
-    IfFileExists $I2PINSTEXE\router.config +2 0
-        File  /a /r "I2P/config/router.config"
-    IfFileExists $I2PINSTEXE\clients.config +2 0
-        File  /a /r "I2P/config/clients.config"
-    IfFileExists $I2PINSTEXE\wrapper.config +2 0
-        File  /a /r "I2P/config/wrapper.config"
-    IfFileExists $I2PINSTEXE\hosts.txt +2 0
-        File  /a /r "I2P/config/hosts.txt"
-    IfFileExists $I2PINSTEXE\eepsite +2 0
-        File  /a /r "I2P/config/eepsite"
-    IfFileExists $I2PINSTEXE\webapps +2 0
-        File  /a /r "I2P/config/webapps"
+    createDirectory "$INSTDIR\"
+    SetOutPath "$INSTDIR\"
     File  /a /r "I2P/config/certificates"
     File  /a /r "I2P/config/geoip"
-    File  /a /r "I2P/config/i2ptunnel.config"
 FunctionEnd
 
 Function installerFunction
@@ -177,68 +168,44 @@ Function installerFunction
             Sleep 500
         ${LoopWhile} $0 <> 0
     ${EndIf}
+    # delete the jpackaged file for safety. Remove this IMMEDIATELY after the next release.
+    # early-adopters and daily-build users may have to manually delete config files if they
+    # uninstall.
+    # RELATED: line 246
+    Delete "$INSTDIR\jpackaged"
 
     # set the installation directory as the destination for the following actions
     createDirectory $INSTDIR
     SetOutPath $INSTDIR
     File ui2pbrowser_icon.ico
 
-    # Update jpackaged I2P router, if it exists
-    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
-        createDirectory $I2PINSTEXE
-        SetOutPath $I2PINSTEXE
-
-        ${If} ${Silent}
-          ReadEnvStr $0 OLD_I2P_VERSION
-          ${If} $0 < ${I2P_VERSION}
-            call routerDetect
-
-          ${EndIf}  
-        ${Else}
-          call routerDetect
-
-        ${EndIf}
-    ${EndIf}
+    # Update jpackaged I2P router
+    call routerDetect
 
     # Install the launcher scripts
     createDirectory "$INSTDIR"
-    #SetOutPath "$INSTDIR"
-    #File "win/*"
 
     # Install the licenses
     createDirectory "$INSTDIR\licenses"
     SetOutPath "$INSTDIR\licenses"
     File /a /r "licenses/*"
 
-    SetOutPath "$I2PINSTEXE"
+    SetOutPath "$INSTDIR"
     createDirectory "$SMPROGRAMS\${APPNAME}"
-    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P.lnk" "$I2PINSTEXE\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
-    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P - Temporary Identity.lnk" "$I2PINSTEXE\I2P.exe -private" "" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P.lnk" "$INSTDIR\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$SMPROGRAMS\${APPNAME}\Browse I2P - Temporary Identity.lnk" "$INSTDIR\I2P.exe -private" "" "$INSTDIR\ui2pbrowser_icon.ico"
 
-    CreateShortCut "$DESKTOP\Browse I2P.lnk" "$I2PINSTEXE\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
-    CreateShortCut "$DESKTOP\Browse I2P - Temporary Identity.lnk" "$I2PINSTEXE\I2P.exe -private" "" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$DESKTOP\Browse I2P.lnk" "$INSTDIR\I2P.exe" "" "$INSTDIR\ui2pbrowser_icon.ico"
+    CreateShortCut "$DESKTOP\Browse I2P - Temporary Identity.lnk" "$INSTDIR\I2P.exe -private" "" "$INSTDIR\ui2pbrowser_icon.ico"
     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
+    IfFileExists "$INSTDIR\eepsite\docroot" +2 0
         File  /a /r "I2P\eepsite"
 
-    createDirectory "$I2PINSTEXE"
-    SetOutPath "$I2PINSTEXE"
+    createDirectory "$INSTDIR"
+    SetOutPath "$INSTDIR"
 
     SetOutPath "$INSTDIR"
     # create the uninstaller
@@ -257,12 +224,12 @@ SectionEnd
 # uninstaller section start
 Section "uninstall"
     # Uninstall the launcher scripts
-    Delete $INSTDIR\*
-    rmDir /r "$INSTDIR\"
-    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
-        Delete $I2PINSTEXE\*
-        rmDir /r "$I2PINSTEXE"
-    ${EndIf}
+    rmDir /r "$INSTDIR\app"
+    rmDir /r "$INSTDIR\config"
+    rmDir /r "$INSTDIR\runtime"
+    Delete "$INSTDIR\ui2pbrowser_icon.ico"
+    Delete "$INSTDIR\windowsUItoopie2.png"
+    Delete "$INSTDIR\I2P.exe"
 
     # Remove shortcuts and folders
     Delete "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
@@ -274,16 +241,27 @@ Section "uninstall"
     Delete "$DESKTOP\${APPNAME}.lnk"
     Delete "$DESKTOP\Private Browsing-${APPNAME}.lnk"
     rmDir /r "$SMPROGRAMS\${APPNAME}"
-    rmDir /r "$INSTDIR\firefox.profile.i2p\extensions"
-    rmDir /r "$INSTDIR\firefox.profile.i2p"
-    rmDir /r "$LOCALAPPDATA\${APPNAME}"
-    rmDir /r "$INSTDIR"
     
+    #### SUPER SUPER EXTRA IMPORTANT!
+    ### RELATED: line 169
+    ## IF YOU DO THIS WRONG YOU WILL BREAK CONFIGS:
+    ## The purpose of the `jpackaged` file has changed, as has the point
+    ## where it is created.
+    # 1. The jpackaged file is now created only **after** the jpackage itself
+    #  has migrated default configs into the $INSTDIR. IF THEY ALREADY EXIST,
+    #  it WILL NOT BE CREATED, even if there is a jpackage present. This is
+    #  intentional behavior.
+    # 2. The jpackaged file now indicates that the configurations were created
+    #  by running the jpackage, and not by an un-bundled router. If it is not
+    #  present, then we have already deleted everything we are responsible for
+    #  and don't need to do the section below.
+    ${If} ${FileExists} "$INSTDIR\jpackaged"
+        Delete $INSTDIR\*
+        rmDir /r "$INSTDIR"
+    ${EndIf}
     # delete the uninstaller
     Delete "$INSTDIR\uninstall-i2pbrowser.exe"
-
     # uninstaller section end
-
 SectionEnd
 
 !define MUI_FINISHPAGE_RUN
@@ -292,8 +270,8 @@ SectionEnd
 !insertmacro MUI_PAGE_FINISH
 
 Function LaunchLink
-  SetOutPath "$I2PINSTEXE"
-  StrCpy $OUTDIR $I2PINSTEXE
+  SetOutPath "$INSTDIR"
+  StrCpy $OUTDIR $INSTDIR
   ${If} ${Silent}
     ReadEnvStr $0 RESTART_I2P
     ${If} $0 != ""

src/nsis/i2pbrowser-jpackage.nsi

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

src/nsis/i2pbrowser-version.nsi

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

src/profile/bookmarks.html

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

src/profile/prefs.js

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

src/profile/user-overrides.js

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

src/profile/version.txt

@@ -1 +0,0 @@
-1.9.6

src/unix/desktop/i2pbrowser-debian.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=/usr/bin/i2pbrowser.sh
-Name=I2P Browser
-Categories=Network;WebBrowser;
-Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico

src/unix/desktop/i2pbrowser.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=/usr/local/bin/i2pbrowser
-Name=I2P Browser
-Categories=Network;WebBrowser;
-Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico

src/unix/desktop/i2pconfig-debian.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=/usr/bin/i2pconfig.sh
-Name=I2P Configuration
-Categories=Network;WebBrowser;
-Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico

src/unix/desktop/i2pconfig.desktop

@@ -1,9 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Type=Application
-Terminal=false
-Exec=/usr/local/bin/i2pconfig
-Name=I2P Configuration
-Categories=Network;WebBrowser;
-Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico

src/unix/i2p-config-service-setup.sh

@@ -1,21 +0,0 @@
-#! /usr/bin/env sh
-
-# Works for Debian service installs. Sets up minified, custom profile for configuring I2P console.
-
-if grep '^i2psvc:' /etc/passwd; then
-  I2P_HOME=$(grep '^i2psvc:' /etc/passwd | sed 's|i2psvc:x:||g' | sed 's|:/usr/sbin/nologin||g' | tr -d ':1234567890' | sed 's|ip|i2p|g')
-  ROUTER_CONFIG=$(sudo -u i2psvc ls $I2P_HOME/i2p-config/router.config)
-fi
-
-installer(){
-
-  if [ $(sudo -u i2psvc ls $I2P_HOME/i2p-config/router.config) ]; then
-    echo $I2P_HOME $ROUTER_CONFIG $0
-      if ! sudo -u i2psvc grep -R 'routerconsole.browser' "$I2P_HOME/i2p-config/router.config" ; then
-        echo "routerconsole.browser=/usr/local/bin/i2pconfig" | sudo tee -a "$I2P_HOME/i2p-config/router.config"
-      fi
-  fi
-}
-
-
-installer

src/unix/i2pbrowser.sh

@@ -1,44 +0,0 @@
-#! /usr/bin/env sh
-
-if [ -f "/etc/i2pbrowser/i2pbrowserrc" ]; then
-  . /etc/i2pbrowser/i2pbrowserrc
-fi
-
-if [ ! -z $I2PROUTER ]; then
-  "$I2PROUTER" start
-fi
-
-if [ -z $BROWSING_PROFILE ]; then
-  BROWSING_PROFILE="."
-fi
-
-if [ ! -d "$BROWSING_PROFILE" ]; then
-  mkdir -p "$BROWSING_PROFILE" 
-  cp -vr /var/lib/i2pbrowser/profile/* "$BROWSING_PROFILE" 
-fi
-
-if [ ! -f "$BROWSING_PROFILE/user.js" ]; then
-  echo "user.js not present in $BROWSING_PROFILE, this is not a Firefox profile"
-  exit 1
-fi
-
-if [ -z $FIREFOX ]; then
-  if [ -f "firefox/firefox" ]; then
-    FIREFOX="./firefox/firefox"
-  fi
-  FIREFOX=$(which firefox-esr)
-  if [ -z $FIREFOX ]; then
-    FIREFOX=$(which firefox)
-  fi
-fi
-
-if [ -z $FIREFOX ]; then
-  echo "Firefox does not appear to be in your \$PATH."
-  echo "Please install Firefox via a package manager, or"
-  echo "or set the FIREFOX variable in your shell to the"
-  echo "location of a Firefox executable."
-  exit 1
-fi
-
-echo $FIREFOX --profile "$BROWSING_PROFILE" $@
-$FIREFOX --profile "$BROWSING_PROFILE" $@

src/unix/i2pbrowserdebianrc

@@ -1,17 +0,0 @@
-
-I2PROUTER=$(which i2prouter)
-
-if [ -z $I2PROUTER ]; then
-  I2PROUTER=/usr/sbin/i2prouter
-fi
-
-if [ ! -f $I2PROUTER ]; then
-  I2PROUTER="$HOME/i2p/i2prouter"
-fi
-
-if [ ! -f $I2PROUTER ]; then
-  I2PROUTER=""
-fi
-
-wget -q -O - "http://localhost:7657" >/dev/null  && I2PROUTER=""
-echo "$I2PROUTER"

src/unix/i2pbrowserrc

@@ -1,8 +0,0 @@
-
-if [ -f /etc/i2pbrowser/i2pbrowserdebianrc ]; then
-  . /etc/i2pbrowser/i2pbrowserdebianrc
-fi
-
-CONFIGURING_PROFILE=$HOME/i2p/firefox/webapps
-BROWSING_PROFILE=$HOME/i2p/firefox/browsing
-ROUTER_CONSOLE="127.0.0.1:7657"

src/unix/i2pconfig.sh

@@ -1,60 +0,0 @@
-#! /usr/bin/env sh
-
-if [ -f "/etc/i2pbrowser/i2pbrowserrc" ]; then
-  . /etc/i2pbrowser/i2pbrowserrc
-fi
-
-if [ ! -z $I2PROUTER ]; then
-  "$I2PROUTER" start
-fi
-
-if [ -f "$HOME/.i2p/router.config" ]; then
-  if [ "$0" = "/usr/local/bin/i2pconfig" ]; then
-    if ! grep -R 'routerconsole.browser' "$HOME/.i2p/router.config" ; then
-      echo "routerconsole.browser=$0" | tee -a "$HOME/.i2p/router.config"
-    fi
-  fi
-fi
-
-if [ -z $CONFIGURING_PROFILE ]; then
-  CONFIGURING_PROFILE="."
-fi
-
-if [ -z $ROUTER_CONSOLE ]; then
-  ROUTER_CONSOLE="$1"
-  if [ -z $1 ]; then
-    ROUTER_CONSOLE="http://127.0.0.1:7657"
-  fi
-fi
-
-if [ ! -d "$CONFIGURING_PROFILE" ]; then
-  mkdir -p "$CONFIGURING_PROFILE" 
-  cp -vr /var/lib/i2pbrowser/app-profile/* "$CONFIGURING_PROFILE" 
-fi
-
-if [ ! -f "$CONFIGURING_PROFILE/user.js" ]; then
-  echo "user.js not present in $CONFIGURING_PROFILE, this is not a Firefox profile"
-  exit 1
-fi
-
-if [ -z $FIREFOX ]; then
-  if [ -f "firefox/firefox" ]; then
-    FIREFOX="./firefox/firefox"
-  fi
-  FIREFOX=$(which firefox-esr)
-  if [ -z $FIREFOX ]; then
-    FIREFOX=$(which firefox)
-  fi
-fi
-
-if [ -z $FIREFOX ]; then
-  echo "Firefox does not appear to be in your \$PATH."
-  echo "Please install Firefox via a package manager, or"
-  echo "or set the FIREFOX variable in your shell to the"
-  echo "location of a Firefox executable."
-  exit 1
-fi
-
-echo $FIREFOX --profile "$CONFIGURING_PROFILE" "$ROUTER_CONSOLE" $@
-
-$FIREFOX --profile "$CONFIGURING_PROFILE" "$ROUTER_CONSOLE" $@

src/unix/torbrowser.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+TORSOCKS=$(which torsocks)
+if [ -f "${TORSOCKS}" ]; then
+    . "${TORSOCKS}" on
+fi
+
+version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
+locale="en-US" # mention your locale. default = en-US
+if [ -d /etc/default/locale ]; then
+    . /etc/default/locale
+    locale=$(echo "${LANG}" | cut -d . -f1)
+fi
+
+if [ ! -f ./tor.keyring ]; then
+    gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org
+    gpg --output ./tor.keyring --export torbrowser@torproject.org
+fi
+
+if [ ! -f "tor-browser-linux64-${version}_${locale}.tar.xz" ]; then
+    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${locale}.tar.xz" 
+    wget -cv "https://www.torproject.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${locale}.tar.xz.asc"
+fi
+
+gpgv --keyring ./tor.keyring "tor-browser-linux64-${version}_${locale}.tar.xz.asc" "tor-browser-linux64-${version}_${locale}.tar.xz"
+
+tar xvJf "tor-browser-linux64-${version}_${locale}.tar.xz"

targz.sh

@@ -5,13 +5,31 @@ 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
-
+export machine=unix
 ./clean.sh
 wsl make distclean
-wsl make clean-extensions
-wsl make extensions
 ./build.sh
-tar czvf I2P.tar.gz I2P
+cd "$SCRIPT_DIR/I2P" || exit 1
+
+TORSOCKS=$(which torsocks)
+if [ -f "${TORSOCKS}" ]; then
+    . "${TORSOCKS}" on
+fi
+./lib/torbrowser.sh
+version="$(curl -s https://aus1.torproject.org/torbrowser/update_3/release/downloads.json | jq -r ".version")"
+. "${TORSOCKS}" off
+locale="en-US" # mention your locale. default = en-US
+if [ -d /etc/default/locale ]; then
+    . /etc/default/locale
+    locale=$(echo "${LANG}" | cut -d . -f1)
+fi
+rm -vrf "tor-browser_${locale}"
+cd "$SCRIPT_DIR" || exit 1
+
+
+
+
+tar czvf I2P.tar.gz I2P

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