Use the shortcuts to launch the link, fix ShellExecAsUser based on some testing

Adds support for building a `.deb` package for Debian or Ubuntu using "Official" tools(debuild, etc)

Closes #5

See merge request i2p-hackers/i2p.firefox!5

.gitignore

@@ -5,4 +5,7 @@ build
 i2pversion_override
 *.crl
 *.crt
-*.pem
+*.pem
+*.p12
+.stfolder
+*.url

Makefile

@@ -9,23 +9,23 @@ include .version
 
 PROFILE_VERSION=$(MAJOR).$(MINOR).$(BUILD)
 
-all: .version install.exe
+all: .version prep install.exe
 
 tag:
 	git tag $(PROFILE_VERSION)
 
 .version:
 	sed 's|!define VERSION||g' src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version
-	make version.txt src/nsis/i2pbrowser_jpackage.nsi
+	make version.txt i2pbrowser-jpackage.nsi
 
 version.txt:
 	echo "$(PROFILE_VERSION)" > src/profile/version.txt
 	echo "$(PROFILE_VERSION)" > src/app-profile/version.txt
 
-src/nsis/i2pbrowser_jpackage.nsi:
-	echo "!define I2P_VERSION $(I2P_VERSION)" > src/nsis/i2pbrowser_jpackage.nsi
+i2pbrowser-jpackage.nsi:
+	echo "!define I2P_VERSION $(I2P_VERSION)" > src/nsis/i2pbrowser-jpackage.nsi
 
-jpackage: .version I2P all
+jpackage: .version I2P build/I2P/config all
 
 help: .version
 	@echo "I2P-Profile-Installer-$(PROFILE_VERSION)"
@@ -39,28 +39,27 @@ prep: profile.tgz app-profile.tgz profile build/licenses build/I2P build/I2P/con
 	cp src/nsis/*.nsh build
 	cp src/icons/*.ico build
 
-install.exe: prep
+install.exe:
 	cd build && makensis i2pbrowser-installer.nsi && cp I2P-Profile-Installer-*.exe ../ && echo "built windows installer"
 
-export RES_DIR="../i2p.i2p/installer/resources"
-export PKG_DIR="../i2p.i2p/pkg-temp"
-export I2P_JBIGI="../i2p.i2p/installer/lib/jbigi"
+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
 	rm -rf I2P
+	git clean -fd
 
 I2P:
 	./build.sh
 
-build/I2P: build
+build/I2P: I2P build
 	rm -rf build/I2P
 	cp -rv I2P build/I2P ; true
 	cp "$(I2P_JBIGI)"/*windows*.dll build/I2P/runtime/lib; true
 
-configdir: src/I2P/config
-
-src/I2P/config:
-	mkdir src/I2P/config
+src/I2P/config: build/I2P
+	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/
@@ -76,9 +75,10 @@ src/I2P/config:
 	cp -R "$(PKG_DIR)"/webapps src/I2P/config/webapps
 	cd src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../..
 
-build/I2P/config: build/I2P src/I2P/config
-	cp -rv src/I2P/config build/I2P/config ; true
-	cp -rv src/I2P/config build/I2P/.i2p ; true
+build/I2P/config: src/I2P/config build/I2P
+	cp -rv src/I2P/config build/I2P/config
+#	cp -rv build/I2P/* I2P/
+#	cp -rv src/I2P/config build/I2P/.i2p
 
 #
 # Warning: a displayed license file of more than 28752 bytes
@@ -92,270 +92,58 @@ build/licenses: build
 	unix2dos build/licenses/LICENSE.index
 
 clean:
-	rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb src/I2P/config *.su3 .version
+	rm -rf build app-profile-*.tgz profile-*.tgz I2P-Profile-Installer-*.exe *.deb src/I2P/config *.su3 .version *.url
+	git clean -fdx src build
 
 build:
 	@echo "creating build directory"
 	mkdir -p build
 
-profile: build/profile/user.js build/profile/prefs.js build/profile/bookmarks.html build/profile/storage-sync.sqlite copy-xpi
+include makefiles/profile.mk
 
-profile.tgz: .version profile
-#	$(eval PROFILE_VERSION := $(shell cat src/profile/version.txt))
-	@echo "building profile tarball $(PROFILE_VERSION)"
-	sh -c 'ls 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 ../
+include makefiles/app-profile.mk
 
-build/profile/user.js: build/profile src/profile/user.js
-	cp src/profile/user.js build/profile/user.js
+-include makefiles/new-extensions.mk
 
-build/profile/prefs.js: build/profile src/profile/prefs.js
-	cp src/profile/prefs.js build/profile/prefs.js
+include makefiles/extensions.mk
 
-build/profile/bookmarks.html: build/profile src/profile/bookmarks.html
-	cp src/profile/bookmarks.html build/profile/bookmarks.html
+include makefiles/build.mk
 
-build/profile/storage-sync.sqlite: build/profile src/profile/storage-sync.sqlite
-	cp src/profile/storage-sync.sqlite build/profile/storage-sync.sqlite
+include makefiles/install.mk
 
-copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions
-	cp build/NoScript.xpi "build/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-	cp build/HTTPSEverywhere.xpi "build/profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions/i2ppb@eyedeekay.github.io.xpi
+include makefiles/su.mk
 
-app-profile: .version build/app-profile/user.js build/app-profile/prefs.js build/app-profile/chrome/userChrome.css build/app-profile/bookmarks.html build/app-profile/storage-sync.sqlite copy-app-xpi
+include makefiles/su-unsigned.mk
 
-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 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 ../
+include makefiles/docker.mk
 
-build/app-profile/user.js: build/app-profile src/app-profile/user.js
-	cp src/app-profile/user.js build/app-profile/user.js
-
-build/app-profile/prefs.js: build/app-profile src/app-profile/prefs.js
-	cp src/app-profile/prefs.js build/app-profile/prefs.js
-
-build/app-profile/chrome/userChrome.css: build/app-profile/chrome src/app-profile/chrome/userChrome.css
-	cp src/app-profile/chrome/userChrome.css build/app-profile/chrome/userChrome.css
-
-build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.html
-	cp src/app-profile/bookmarks.html build/app-profile/bookmarks.html
-
-build/app-profile/storage-sync.sqlite: build/app-profile src/app-profile/storage-sync.sqlite
-	cp src/app-profile/storage-sync.sqlite build/app-profile/storage-sync.sqlite
-
-copy-app-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions
-	cp build/HTTPSEverywhere.xpi "build/app-profile/extensions/https-everywhere-eff@eff.org.xpi"
-	cp build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions/i2ppb@eyedeekay.github.io.xpi
-
-build-extensions: build/i2ppb@eyedeekay.github.io.xpi build/NoScript.xpi build/HTTPSEverywhere.xpi
-
-build/i2ppb@eyedeekay.github.io.xpi: i2psetproxy.url
-	curl -L `cat i2psetproxy.url` > build/i2ppb@eyedeekay.github.io.xpi
-
-build/NoScript.xpi: NoScript.url
-	curl -L `cat NoScript.url` > build/NoScript.xpi
-
-build/HTTPSEverywhere.xpi: HTTPSEverywhere.url
-	curl -L `cat HTTPSEverywhere.url` > build/HTTPSEverywhere.xpi
-
-clean-extensions:
-	rm -fv i2psetproxy.url NoScript.url HTTPSEverywhere.url
-
-extensions:HTTPSEverywhere.url NoScript.url i2psetproxy.url
-
-HTTPSEverywhere.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3809748/"`./amo-version.sh https-everywhere`"/https-everywhere-eff@eff.org.xpi" > HTTPSEverywhere.url
-
-NoScript.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3534184/"`./amo-version.sh noscript`"/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi" > NoScript.url
-
-i2psetproxy.url:
-	@echo "https://addons.mozilla.org/firefox/downloads/file/3821635/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url
-
-#https://addons.mozilla.org/firefox/downloads/file/3821635/i2p_in_private_browsing-0.112.1-an+fx.xpi
-#i2ppb@eyedeekay.github.io.xpi
-
-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/i2pbrowser.bat:
-	cp src/win/i2pbrowser.bat build/win/i2pbrowser.bat
-
-build/win/i2pconfig.bat:
-	cp src/win/i2pconfig.bat build/win/i2pconfig.bat
-
-build/win/i2pbrowser-private.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
-
-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
-
-GOPATH=$(HOME)/go
-
-$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
-	git clone https://i2pgit.org/idk/su3-tools $(GOPATH)/src/i2pgit.org/idk/su3-tools; true
-	git pull --all
-	cd $(GOPATH)/src/i2pgit.org/idk/su3-tools && \
-		go mod vendor && go build
-
-su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
-	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
-
-docker:
-	docker build -t geti2p/i2p.firefox .
-
-xhost:
-	xhost + local:docker
-
-run: docker xhost
-	docker run -it --rm \
-		--net=host \
-		-e DISPLAY=unix$(DISPLAY) \
-		-v /tmp/.X11-unix:/tmp/.X11-unix \
-		geti2p/i2p.firefox firefox --profile /src/build/profile
-
-orig:
-	tar --exclude=debian --exclude=.git -cvzf ../i2p-firefox-profile_$(PROFILE_VERSION).orig.tar.gz .
-
-## HOWTO: If you need to release a package to launchpad, build for the oldest
-## release launchpad supports(bionic AFIACT). Then, after the build is
-## published, copy it to the other distributions. When bionic is out of date,
-## update it to the new LTS.
-
-bionic:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) bionic; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-focal:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) focal; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-groovy:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) groovy; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-buster:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) buster; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-bullseye:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) bullseye; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-trixie:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) trixie; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-sid:
-	@sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) sid; urgency=medium|g" debian/changelog
-	make orig
-	debuild -S
-	make dput
-
-dput:
-	dput --simulate --force ppa:i2p-community/ppa ../i2p-firefox-profile_$(PROFILE_VERSION)-1_source.changes || exit
-	dput --force ppa:i2p-community/ppa ../i2p-firefox-profile_$(PROFILE_VERSION)-1_source.changes
-
-launchpad: bionic
+include makefiles/debian.mk
 
 I2P_DATE=`date +%Y-%m-%d`
 
-prepupdate:
-	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe" i2pwinupdate.su3
+MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
+MAGNET_TESTING=`bttools torrent printinfo i2pwinupdate-testing.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
 
-i2pwinupdate.su3.torrent: prepupdate
-	mktorrent --announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a i2pwinupdate.su3
+BLANK=`awk '! NF { print NR; exit }' changelog.txt`
 
-torrent: i2pwinupdate.su3
+I2P.zip: I2P-jpackage-windows-$(I2P_VERSION).zip
 
-MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g'`
+I2P-jpackage-windows-$(I2P_VERSION).zip:
+	zip I2P-jpackage-windows-$(I2P_VERSION).zip -r build/I2P
 
-releases.json: torrent
-	@echo "["		| tee ../i2p.newsxml/data/win/beta/releases.json
-	@echo "  {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"date\": \"$(I2P_DATE)\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"version\": \"$(I2P_VERSION)\","	| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"minVersion\": \"1.5.0\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"minJavaVersion\": \"1.8\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    \"updates\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "      \"su3\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "        \"torrent\": \"$(MAGNET)\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "        \"url\": ["		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""	| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "        ]"	| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "      }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "    }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "  }"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
-	@echo "]"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+changelog:
+	head -n "$(BLANK)" changelog.txt
 
+release-jpackage: I2P-jpackage-windows-$(I2P_VERSION).zip
+	head -n "$(BLANK)" changelog.txt | gothub release -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true
+
+update-release-jpackage:
+	head -n "$(BLANK)" changelog.txt | gothub edit -p -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n i2p-jpackage-windows-$(I2P_VERSION) -d -; true
+
+delete-release-jpackage:
+	gothub delete -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION); true
+
+upload-release-jpackage:
+	gothub upload -R -u eyedeekay -r i2p -t i2p-jpackage-windows-$(I2P_VERSION) -n "i2p-jpackage-windows-$(I2P_VERSION)" -f "./I2P-jpackage-windows-$(I2P_VERSION).zip"
+
+jpackage-release: release-jpackage upload-release-jpackage

README.md

@@ -21,7 +21,16 @@ To build this, you will need the following software packages (all available in D
  * curl
  * jq
 
-to build a Debian package, you'll also need
+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)
+and copy the content of `Plugins` to `/usr/share/nsis/Plugins`.
+
+```sh
+cp -rv Plugins/* /usr/share/nsis/Plugins/
+```
+
+To build a Debian package, you'll also need
 
  * checkinstall
 

amo-version.sh

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

build.sh

@@ -1,19 +1,27 @@
 #!/bin/bash
 set -e 
 
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "$SCRIPT_DIR" || exit 1
+
 . i2pversion
 
 if [ -f i2pversion_override ]; then
   . i2pversion_override
 fi
 
+COUNT="Ten Nine Eight Seven Six Five Four Three Two One"
+
 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
-sleep 2s
+if [ "$JAVA" -lt "17" ]; then
+  echo "It is highly recommended that you use Java 17+ to build release packages"
+fi
+sleep 5s
 
 if [ -z "${JAVA_HOME}" ]; then
   JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
@@ -24,15 +32,22 @@ echo "cleaning"
 ./clean.sh
 
 HERE="$PWD"
-cd "$HERE/../i2p.i2p/"
+if [ ! -d "$HERE/../i2p.i2p.jpackage-build/" ]; then
+  git clone https://i2pgit.org/i2p-hackers/i2p.i2p "$HERE/../i2p.i2p.jpackage-build/"
+fi
+cd "$HERE/../i2p.i2p.jpackage-build/"
 git checkout "$VERSION"
-ant distclean preppkg-windows || true
+for i in $COUNT; do
+  echo -n "$i...."; sleep 1s
+done
+ant distclean pkg || true
 
 cd "$HERE"
-RES_DIR="$HERE/../i2p.i2p/installer/resources"
-I2P_JARS="$HERE/../i2p.i2p/pkg-temp/lib"
-I2P_JBIGI="$HERE/../i2p.i2p/installer/lib//jbigi"
-I2P_PKG="$HERE/../i2p.i2p/pkg-temp"
+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 build
@@ -55,7 +70,10 @@ echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
 
 "$JAVA_HOME"/bin/jpackage --type app-image --name I2P --app-version "$I2P_VERSION" \
   --verbose \
+  --java-options "-Xmx512m" \
+  --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
   $JPACKAGE_OPTS \
   --resource-dir build \
-  --java-options "--illegal-access=permit" \
   --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher

changelog.txt

@@ -1,3 +1,53 @@
+2022-02-10 idk
+* This release fixes automatic update using Bittorrent within the I2P network
+ and the custom Update PostProcessor.
+* Fixes the first-run launcher bug
+* Drastically simplifies the Windows build process
+* Adds support for development releases
+* Adds support for Debian packaging(Of just the Firefox profile)
+
+2021-11-1 idk
+* HTTPS Everywhere will now self-disable on some Firefox versions. This is not
+ an issue since HTTPS Everywhere is deprecated in favor of Firefox built-in
+ HTTPS enforcement features.
+* .bat Script: Detect location of C:\Program Files\I2P or
+ C\Program Files(x86)\I2P in launcher scripts
+* NSIS changes
+ - Make launcher scripts static artifacts instead of generating them during
+  the install process
+ - If a jpackaged I2P router is present in $checkout/I2P, include it in an
+  installer.
+ - If a running installer doesn't find an I2P router in Program Files, install
+  the jpackaged I2P router. Mark it as jpackaged so we can quickly determine
+  from other applications.
+* I2P in Private Browsing changes
+ - bugfix for `reset()` of dynamic theme
+ - bugfix for erroneous redirect/contain of mis-identified I2PSnark containers
+ - improve support for in-I2P HTTPS
+ - use global CSS on pageAction panels for HTTP, HTTPS, and Bittorrent(@sadie)
+ - improve support for I2PSnark web handler in HTTPS tabs
+ - icon update(@sadie)
+ - contain android-incompatible features so they won't be executed on Fennec
+ - translate into Spanish
+ - visually conceal/reveal features based on whether they are enabled/configured.
+* I2P Jpackage
+ - support for building an I2P Jpackage has been added to the build system
+  Note that support is platform-specific, to build a Windows jpackage one must
+  use a Windows OS, to build a Linux jpackage one must use a Linux OS. Only
+  Windows jpackages are used for a release product.
+ - For information about how releases are built see README.md and UPDATES.md
+ - The jpackaged router has the following differences from mainline I2P:
+  - The jars are installed to a different directory.
+  - The native libraries are installed to a different directory
+  - The wrapper script is not installed and not used, and replaced by the
+   browser launcher.
+  - The I2P executable is %programfiles%/I2P/I2P.exe, command-line flags are not
+   compatible but configuration files are.
+  - wrapper.config is unused
+  - The built-by entry will reflect that idk built the package
+  - Use flags to achieve compatibility with plugins that use Reflection on Java
+   17 jpackages
+
 2021-01-17 idk
 * Use Local Application Data instead of Roaming application data for router.config file
 * Use Roaming Application Daya only if a clients.config.d is present, indicating that the

clean.sh

@@ -1,5 +1,9 @@
 #! /usr/bin/env sh
 
+here=$(pwd)
+cd ../i2p.i2p.jpackage-build/
+ant distclean
+cd "$here"
 rm -rf \
 	build \
 	eventlog.txt \

debian/files

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

i2pversion

@@ -3,13 +3,13 @@
 
 #Comment this out to build from an alternate branch or
 # the tip of the master branch.
-I2P_VERSION=1.5.0
-export I2P_VERSION=1.5.0
+I2P_VERSION=1.7.0
+export I2P_VERSION=1.7.0
 VERSION=i2p-"$I2P_VERSION"
 export VERSION="$VERSION"
 
 #Uncomment this to build from the tip of the master.
-#I2P_VERSION=0.9.50
-#export I2P_VERSION=0.9.50
+#I2P_VERSION=1.7.0
+#export I2P_VERSION=1.7.0
 #VERSION=master
 #export VERSION="$VERSION"

java/net/i2p/router/WinLauncher.java

@@ -17,17 +17,17 @@ import static net.i2p.update.UpdateType.*;
 
 /**
  * Launches a router from %PROGRAMFILES%/I2P using configuration data in
- * %LOCALAPPDATA%/I2P..  Uses Java 9 APIs.
-
+ * %LOCALAPPDATA%/I2P.. Uses Java 9 APIs.
+ * 
  * Sets the following properties:
  * i2p.dir.base - this points to the (read-only) resources inside the bundle
- * i2p.dir.config this points to the (read-write) config directory in local appdata
+ * i2p.dir.config this points to the (read-write) config directory in local
+ * appdata
  * router.pid - the pid of the java process.
  */
 public class WinLauncher {
-    private static WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor();
     public static void main(String[] args) throws Exception {
-        File programs = wupp.selectProgramFile();
+        File programs = selectProgramFile();
         if (!programs.exists())
             programs.mkdirs();
         else if (!programs.isDirectory()) {
@@ -46,9 +46,10 @@ public class WinLauncher {
         System.setProperty("i2p.dir.base", programs.getAbsolutePath());
         System.setProperty("i2p.dir.config", home.getAbsolutePath());
         System.setProperty("router.pid", String.valueOf(ProcessHandle.current().pid()));
-        System.out.println("\t"+System.getProperty("i2p.dir.base") +"\n\t"+System.getProperty("i2p.dir.config")+"\n\t"+ System.getProperty("router.pid"));
+        System.out.println("\t" + System.getProperty("i2p.dir.base") + "\n\t" + System.getProperty("i2p.dir.config")
+                + "\n\t" + System.getProperty("router.pid"));
 
-        wupp.i2pRouter = new Router(System.getProperties());
+        // wupp.i2pRouter = new Router(System.getProperties());
         System.out.println("Router is configured");
 
         Thread registrationThread = new Thread(REGISTER_UPP);
@@ -56,25 +57,31 @@ public class WinLauncher {
         registrationThread.setDaemon(true);
         registrationThread.start();
 
-        wupp.i2pRouter.runRouter();
+        // wupp.i2pRouter.runRouter();
+        RouterLaunch.main(args);
     }
 
     private static final Runnable REGISTER_UPP = () -> {
 
         // first wait for the RouterContext to appear
         RouterContext ctx;
-        while ((ctx = (RouterContext) wupp.i2pRouter.getContext().getCurrentContext()) == null) {
+        while ((ctx = (RouterContext) RouterContext.getCurrentContext()) == null) {
             sleep(1000);
         }
 
         // then wait for the update manager
-        ClientAppManager cam = ctx.clientAppManager();
+
+        ClientAppManager cam;
+        while ((cam = ctx.clientAppManager()) == null) {
+            sleep(1000);
+        }
+
         UpdateManager um;
         while ((um = (UpdateManager) cam.getRegisteredApp(UpdateManager.APP_NAME)) == null) {
             sleep(1000);
         }
 
-        wupp = new WindowsUpdatePostProcessor(ctx);
+        WindowsUpdatePostProcessor wupp = new WindowsUpdatePostProcessor(ctx);
         um.register(wupp, UpdateType.ROUTER_SIGNED_SU3, SU3File.TYPE_EXE);
         um.register(wupp, UpdateType.ROUTER_DEV_SU3, SU3File.TYPE_EXE);
     };
@@ -88,7 +95,7 @@ public class WinLauncher {
         }
     }
 
-    private static File selectHome() { //throws Exception {
+    private static File selectHome() { // throws Exception {
         if (SystemVersion.isWindows()) {
             File home = new File(System.getProperty("user.home"));
             File appData = new File(home, "AppData");
@@ -105,4 +112,17 @@ public class WinLauncher {
         }
     }
 
+    private static File selectProgramFile() {
+        if (SystemVersion.isWindows()) {
+            File jrehome = new File(System.getProperty("java.home"));
+            File programs = jrehome.getParentFile();
+            System.out.println("Windows portable jpackage wrapper found, using: " + programs + " as working config");
+            return programs.getAbsoluteFile();
+        } else {
+            File jrehome = new File(System.getProperty("java.home"));
+            File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
+            System.out.println("Linux portable jpackage wrapper found, using: " + programs + " as working config");
+            return programs.getAbsoluteFile();
+        }
+    }
 }

java/net/i2p/router/WinUpdateProcess.java

@@ -11,20 +11,20 @@ class WinUpdateProcess implements Runnable {
     private final RouterContext ctx;
     private final Supplier<String> versionSupplier;
     private final Supplier<File> fileSupplier;
-    
+
     WinUpdateProcess(RouterContext ctx, Supplier<String> versionSupplier, Supplier<File> fileSupplier) {
         this.ctx = ctx;
         this.versionSupplier = versionSupplier;
         this.fileSupplier = fileSupplier;
     }
-    
-    private File workDir() throws IOException{
+
+    private File workDir() throws IOException {
         if (ctx != null) {
             File workDir = new File(ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
             if (workDir.exists()) {
                 if (workDir.isFile())
                     throw new IOException(workDir + " exists but is a file, get it out of the way");
-                    return null;
+                return null;
             } else {
                 workDir.mkdirs();
             }
@@ -35,9 +35,9 @@ class WinUpdateProcess implements Runnable {
 
     private void runUpdateInstaller() throws IOException {
         String version = versionSupplier.get();
-	File file = fileSupplier.get();
-	if (file == null)
-	    return;
+        File file = fileSupplier.get();
+        if (file == null)
+            return;
 
         var workingDir = workDir();
         var logFile = new File(workingDir, "log-" + version + ".txt");
@@ -52,12 +52,9 @@ class WinUpdateProcess implements Runnable {
             env.put("RESTART_I2P", "true");
 
         try {
-            pb.directory(workingDir).
-                redirectErrorStream(true).
-                redirectOutput(logFile).
-                start();
+            pb.directory(workingDir).redirectErrorStream(true).redirectOutput(logFile).start();
         } catch (IOException ex) {
-                System.out.println("Unable to run update-program in background. Update will fail.");
+            System.out.println("Unable to run update-program in background. Update will fail.");
         }
     }
 
@@ -65,7 +62,7 @@ class WinUpdateProcess implements Runnable {
     public void run() {
         try {
             runUpdateInstaller();
-        } catch(IOException ioe) {
+        } catch (IOException ioe) {
             System.out.println("Error running updater, update may fail." + ioe);
         }
     }

java/net/i2p/router/WindowsUpdatePostProcessor.java

@@ -5,7 +5,6 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.*;
 
-
 import net.i2p.crypto.*;
 import static net.i2p.update.UpdateType.*;
 import net.i2p.I2PAppContext;
@@ -18,36 +17,31 @@ import java.lang.ProcessBuilder;
 import java.lang.Process;
 import java.lang.InterruptedException;
 
-
 public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
-    private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(WindowsUpdatePostProcessor.class);
+    private final Log _log;
     private final RouterContext ctx;
-    protected static Router i2pRouter = null;
-    
     private final AtomicBoolean hook = new AtomicBoolean();
+    private final String fileName = "i2p-jpackage-update.exe";
 
     private volatile String version;
 
     private volatile File positionedFile = null;
-    private final String fileName = "i2p-jpackage-update.exe";
-
-    WindowsUpdatePostProcessor() {
-    	this.ctx = null;
-    }
 
     WindowsUpdatePostProcessor(RouterContext ctx) {
         this.ctx = ctx;
+        this._log = ctx.logManager().getLog(WindowsUpdatePostProcessor.class);
     }
 
     public String getVersion() {
         return version;
     }
-    
+
     public File getFile() {
         return positionedFile;
     }
 
-    public void updateDownloadedandVerified(UpdateType type, int fileType, String version, File file) throws IOException {
+    public void updateDownloadedandVerified(UpdateType type, int fileType, String version, File file)
+            throws IOException {
         _log.info("Got an update to post-process");
 
         if (type != UpdateType.ROUTER_SIGNED_SU3 && type != UpdateType.ROUTER_DEV_SU3) {
@@ -59,11 +53,11 @@ public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
             _log.warn("Unsupported file type " + fileType);
             return;
         }
-        
+
         this.positionedFile = moveUpdateInstaller(file);
         this.version = version;
-        
-        if (!hook.compareAndSet(false,true)) {
+
+        if (!hook.compareAndSet(false, true)) {
             _log.info("shutdown hook was already set");
             return;
         }
@@ -72,28 +66,28 @@ public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
         ctx.addFinalShutdownTask(new WinUpdateProcess(ctx, this::getVersion, this::getFile));
 
     }
-    
+
     private File moveUpdateInstaller(File file) throws IOException {
-        RouterContext i2pContext = i2pRouter.getContext();
-        if (i2pContext != null) {
+        if (this.ctx != null) {
             File newFile = new File(workDir(), fileName);
             boolean renamedStatus = file.renameTo(newFile);
             if (renamedStatus)
-              return newFile;
+                return newFile;
             else
-              throw new IOException("WindowsUpdatePostProcesssor unable to move file to working directory, update will fail");
+                throw new IOException(
+                        "WindowsUpdatePostProcesssor unable to move file to working directory, update will fail");
         }
-        throw new IOException("Router context not available to WindowsUpdatePostProcesssor, unable to find working directory, update will fail");
+        throw new IOException(
+                "Router context not available to WindowsUpdatePostProcesssor, unable to find working directory, update will fail");
     }
 
-    private File workDir() throws IOException{
-        RouterContext i2pContext = i2pRouter.getContext();
-        if (i2pContext != null) {
-            File workDir = new File(i2pContext.getConfigDir().getAbsolutePath(), "i2p_update_win");
+    private File workDir() throws IOException {
+        if (this.ctx != null) {
+            File workDir = new File(this.ctx.getConfigDir().getAbsolutePath(), "i2p_update_win");
             if (workDir.exists()) {
                 if (workDir.isFile())
                     throw new IOException(workDir + " exists but is a file, get it out of the way");
-                    return null;
+                return null;
             } else {
                 workDir.mkdirs();
             }
@@ -102,18 +96,4 @@ public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
         return null;
     }
 
-    protected File selectProgramFile() {
-        if (SystemVersion.isWindows()) {
-            File jrehome = new File(System.getProperty("java.home"));
-            File programs = jrehome.getParentFile();
-            System.out.println("Windows portable jpackage wrapper found, using: " + programs + " as working config");            
-            return programs.getAbsoluteFile();
-        } else {
-            File jrehome = new File(System.getProperty("java.home"));
-            File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
-            System.out.println("Linux portable jpackage wrapper found, using: " + programs + " as working config");            
-            return programs.getAbsoluteFile();
-        }
-    }
-
 }

makefiles/app-profile.mk

@@ -0,0 +1,28 @@
+app-profile: .version build/app-profile/user.js build/app-profile/prefs.js build/app-profile/chrome/userChrome.css build/app-profile/bookmarks.html build/app-profile/storage-sync.sqlite copy-app-xpi
+
+app-profile.tgz: app-profile
+#	$(eval PROFILE_VERSION := $(shell cat src/app-profile/version.txt))
+	@echo "building app-profile tarball $(PROFILE_VERSION)"
+	sh -c 'ls build/I2P && cp -rv build/I2P build/app-profile/I2P'; true
+	install -m755 src/unix/i2pconfig.sh build/app-profile/i2pconfig.sh
+	cd build && tar -czf app-profile-$(PROFILE_VERSION).tgz app-profile && cp app-profile-$(PROFILE_VERSION).tgz ../
+
+build/app-profile/user.js: build/app-profile src/app-profile/user.js
+	cp src/app-profile/user.js build/app-profile/user.js
+
+build/app-profile/prefs.js: build/app-profile src/app-profile/prefs.js
+	cp src/app-profile/prefs.js build/app-profile/prefs.js
+
+build/app-profile/chrome/userChrome.css: build/app-profile/chrome src/app-profile/chrome/userChrome.css
+	cp src/app-profile/chrome/userChrome.css build/app-profile/chrome/userChrome.css
+
+build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.html
+	cp src/app-profile/bookmarks.html build/app-profile/bookmarks.html
+
+build/app-profile/storage-sync.sqlite: build/app-profile src/app-profile/storage-sync.sqlite
+	cp src/app-profile/storage-sync.sqlite build/app-profile/storage-sync.sqlite
+
+copy-app-xpi: build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions
+	cp build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "build/app-profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
+	cp build/https-everywhere-eff@eff.org.xpi "build/app-profile/extensions/https-everywhere-eff@eff.org.xpi"
+	cp build/i2ppb@eyedeekay.github.io.xpi build/app-profile/extensions/i2ppb@eyedeekay.github.io.xpi

makefiles/build.mk

@@ -0,0 +1,28 @@
+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/i2pbrowser.bat:
+	cp src/win/i2pbrowser.bat build/win/i2pbrowser.bat
+
+build/win/i2pconfig.bat:
+	cp src/win/i2pconfig.bat build/win/i2pconfig.bat
+
+build/win/i2pbrowser-private.bat:
+	cp src/win/i2pbrowser-private.bat build/win/i2pbrowser-private.bat
+
+launchers: build/win build/win/i2pbrowser.bat build/win/i2pbrowser-private.bat build/win/i2pconfig.bat
+
+build/app-profile/chrome: build/app-profile
+	mkdir -p build/app-profile/chrome
+	
+build/app-profile/extensions: build/app-profile
+	mkdir -p build/app-profile/extensions
+
+build/app-profile: build
+	mkdir -p build/app-profile

makefiles/debian.mk

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

makefiles/docker.mk

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

makefiles/extensions.mk

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

makefiles/install.mk

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

makefiles/new-extensions.mk

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

makefiles/profile.mk

@@ -0,0 +1,26 @@
+
+profile: build/profile/user.js build/profile/prefs.js build/profile/bookmarks.html build/profile/storage-sync.sqlite copy-xpi
+
+profile.tgz: .version profile
+#	$(eval PROFILE_VERSION := $(shell cat src/profile/version.txt))
+	@echo "building profile tarball $(PROFILE_VERSION)"
+	sh -c 'ls build/I2P && cp -rv build/I2P build/profile/I2P'; true
+	install -m755 src/unix/i2pbrowser.sh build/profile/i2pbrowser.sh
+	cd build && tar -czf profile-$(PROFILE_VERSION).tgz profile && cp profile-$(PROFILE_VERSION).tgz ../
+
+build/profile/user.js: build/profile src/profile/user.js
+	cp src/profile/user.js build/profile/user.js
+
+build/profile/prefs.js: build/profile src/profile/prefs.js
+	cp src/profile/prefs.js build/profile/prefs.js
+
+build/profile/bookmarks.html: build/profile src/profile/bookmarks.html
+	cp src/profile/bookmarks.html build/profile/bookmarks.html
+
+build/profile/storage-sync.sqlite: build/profile src/profile/storage-sync.sqlite
+	cp src/profile/storage-sync.sqlite build/profile/storage-sync.sqlite
+
+copy-xpi: build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi build/https-everywhere-eff@eff.org.xpi build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions
+	cp build/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi "build/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
+	cp build/https-everywhere-eff@eff.org.xpi "build/profile/extensions/https-everywhere-eff@eff.org.xpi"
+	cp build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions/i2ppb@eyedeekay.github.io.xpi

makefiles/su-unsigned.mk

@@ -0,0 +1,35 @@
+
+prepupdate-unsignedexe:
+	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION).su3" i2pwinupdate-unsignedexe.su3
+
+su3-unsignedexe: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
+	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
+	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION).exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER)
+
+i2pwinupdate-unsignedexe.su3.torrent: prepupdate-unsignedexe su3-unsignedexe
+	mktorrent \
+		--announce=http://tracker2.postman.i2p/announce.php \
+		--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
+		--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
+		i2pwinupdate-unsignedexe.su3
+
+torrent-unsignedexe: i2pwinupdate-unsignedexe.su3.torrent
+
+testing-releases.json: torrent-unsignedexe
+	mkdir -p ../i2p.newsxml/data/win/testing/
+	@echo "["		| tee ../i2p.newsxml/data/win/testing/releases.json
+	@echo "  {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"date\": \"$(I2P_DATE)\","			| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"version\": \"$(I2P_VERSION)\","	| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"minVersion\": \"1.5.0\","			| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"minJavaVersion\": \"1.8\","		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    \"updates\": {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "      \"su3\": {"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "        \"torrent\": \"$(MAGNET_TESTING)\","		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "        \"url\": ["		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""	| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "        ]"	| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "      }"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "    }"		| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "  }"			| tee -a ../i2p.newsxml/data/win/testing/releases.json
+	@echo "]"			| tee -a ../i2p.newsxml/data/win/testing/releases.json

makefiles/su.mk

@@ -0,0 +1,41 @@
+GOPATH=$(HOME)/go
+
+$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools:
+	git clone https://i2pgit.org/idk/su3-tools $(GOPATH)/src/i2pgit.org/idk/su3-tools; true
+	git pull --all
+	cd $(GOPATH)/src/i2pgit.org/idk/su3-tools && \
+		go mod vendor && go build
+
+prepupdate:
+	cp -v "I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3" i2pwinupdate.su3
+
+su3: $(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools
+	$(GOPATH)/src/i2pgit.org/idk/su3-tools/su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)-signed" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
+	java -cp "$(HOME)/i2p/lib/*" net.i2p.crypto.SU3File sign -c ROUTER -f EXE I2P-Profile-Installer-$(PROFILE_VERSION)-signed.exe I2P-Profile-Installer-$(PROFILE_VERSION)-signed.su3 "$(HOME)/.i2p-plugin-keys/news-su3-keystore.ks" "$(I2P_VERSION)" $(SIGNER)
+
+i2pwinupdate.su3.torrent: prepupdate su3
+	mktorrent \
+		--announce=http://tracker2.postman.i2p/announce.php \
+		--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
+		--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
+		i2pwinupdate.su3
+
+torrent: i2pwinupdate.su3.torrent
+
+releases.json: torrent
+	@echo "["		| tee ../i2p.newsxml/data/win/beta/releases.json
+	@echo "  {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"date\": \"$(I2P_DATE)\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"version\": \"$(I2P_VERSION)\","	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"minVersion\": \"1.5.0\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"minJavaVersion\": \"1.8\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"updates\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "      \"su3\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        \"torrent\": \"$(MAGNET)\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        \"url\": ["		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        ]"	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "      }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "  }"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "]"			| tee -a ../i2p.newsxml/data/win/beta/releases.json

router.config

@@ -1,3 +1,3 @@
 router.updateURL=http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3
-router.newsURL=http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/win/stable/news.su3
-router.backupNewsURL=http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/win/stable/news.su3
+router.newsURL=http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/win/beta/news.su3
+router.backupNewsURL=http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/win/beta/news.su3

src/app-profile/version.txt

@@ -1 +1 @@
-1.05.0
+1.07.1

src/nsis/i2pbrowser-installer.nsi

@@ -6,7 +6,7 @@ UniCode true
 !define DESCRIPTION "This launches Firefox with a browser profile pre-configured to use i2p"
 !define FIREFOX_MESSAGE "Could not find Firefox.  Please point to where you have installed Firefox.  If you have not installed Firefox yet, exit this installer and install Firefox, then start this installer again."
 !define I2P_MESSAGE "Could not find I2P.  Please point to where you have installed I2P.  If you have not installed I2P yet, exit this installer and install I2P, then start this installer again."
-!define LAUNCH_TEXT "Launch the i2p browser?"
+!define LAUNCH_TEXT "Start I2P?"
 !define LICENSE_TITLE "Many Licenses"
 !define CONSOLE_URL "http://127.0.0.1:7657/home"
 
@@ -18,7 +18,7 @@ var FFINSTEXE
 var FFNONTORINSTEXE
 var I2PINSTEXE
 
-
+SetOverwrite on
 !define FFINSTEXE
 !define FFNONTORINSTEXE
 !define FFINSTEXE32 "$PROGRAMFILES32\Mozilla Firefox\"
@@ -147,29 +147,29 @@ Function .onInit
     !insertmacro MUI_LANGDLL_DISPLAY
     Call ShouldInstall64Bit
     ${If} $0 == 1
-        ${If} ${FileExists} "${FFINSTEXE64}/firefox.exe"
+        ${If} ${FileExists} "${FFINSTEXE64}\firefox.exe"
             StrCpy $FFINSTEXE "${FFINSTEXE64}"
             StrCpy $FFNONTORINSTEXE "${FFINSTEXE64}"
-    ${ElseIf} ${FileExists} "${FFINSTEXE32}/firefox.exe"
+    ${ElseIf} ${FileExists} "${FFINSTEXE32}\firefox.exe"
             StrCpy $FFINSTEXE "${FFINSTEXE32}"
             StrCpy $FFNONTORINSTEXE "${FFINSTEXE32}"
         ${EndIf}
-        ${If} ${FileExists} "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/firefox.exe"
-            StrCpy $FFINSTEXE "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/"
+        ${If} ${FileExists} "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\"
         ${EndIf}
-        ${If} ${FileExists} "$PROFILE/Desktop/Tor Browser/Browser/firefox.exe"
-            StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/"
+        ${If} ${FileExists} "$PROFILE\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\Desktop\Tor Browser\Browser\"
         ${EndIf}
     ${Else}
-        ${If} ${FileExists} "${FFINSTEXE32}/firefox.exe"
+        ${If} ${FileExists} "${FFINSTEXE32}\firefox.exe"
             StrCpy $FFINSTEXE "${FFINSTEXE32}"
             StrCpy $FFNONTORINSTEXE "${FFINSTEXE32}"
         ${EndIf}
-        ${If} ${FileExists} "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/firefox.exe"
-            StrCpy $FFINSTEXE "$PROFILE/OneDrive/Desktop/Tor Browser/Browser/"
+        ${If} ${FileExists} "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\OneDrive\Desktop\Tor Browser\Browser\"
         ${EndIf}
-        ${If} ${FileExists} "$PROFILE/Desktop/Tor Browser/Browser/firefox.exe"
-            StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/"
+        ${If} ${FileExists} "$PROFILE\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\Desktop\Tor Browser\Browser\"
         ${EndIf}
     ${EndIf}
     StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
@@ -182,7 +182,7 @@ Function .onInit
 FunctionEnd
 
 Function firefoxDetect
-    ${If} ${FileExists} "$FFINSTEXE/firefox.exe"
+    ${If} ${FileExists} "$FFINSTEXE\firefox.exe"
         Abort directory
     ${EndIf}
 FunctionEnd
@@ -194,30 +194,12 @@ Function routerDetect
         createDirectory $I2PINSTEXE
         SetOutPath $I2PINSTEXE
         File /nonfatal /a /r "I2P\"
+        File /nonfatal /a /r "I2P\I2P.exe"
         File /nonfatal "I2P\config\jpackaged"
 
         createDirectory "$I2PINSTEXE\"
         SetOutPath "$I2PINSTEXE\"
-        File /nonfatal "I2P\config\clients.config"
-        File /nonfatal "I2P\config\i2ptunnel.config"
-        File /nonfatal "I2P\config\wrapper.config"
-        File /nonfatal "I2P\config\hosts.txt"
-
-        createDirectory "$I2PINSTEXE\webapps\"
-        SetOutPath "$I2PINSTEXE\webapps\"
-        File /nonfatal /a /r "I2P\config\webapps\"
-
-        createDirectory "$I2PINSTEXE\geoip\"
-        SetOutPath "$I2PINSTEXE\geoip\"
-        File /nonfatal /a /r "I2P\config\geoip\"
-
-        createDirectory "$I2PINSTEXE\certificates\"
-        SetOutPath "$I2PINSTEXE\certificates\"
-        File /nonfatal /a /r "I2P\config\certificates\"
-
-        createDirectory "$I2PINSTEXE\eepsite\"
-        SetOutPath "$I2PINSTEXE\eepsite\"
-        File /nonfatal /a /r "I2P\config\eepsite\"
+        File /nonfatal /a /r "I2P/config/*"
 
         Abort directory
     ${EndIf}
@@ -251,18 +233,8 @@ Section Install
 
             createDirectory "$I2PINSTEXE\"
             SetOutPath "$I2PINSTEXE\"
+            File /nonfatal /a /r "I2P/config/*"
 
-            createDirectory "$I2PINSTEXE\webapps\"
-            SetOutPath "$I2PINSTEXE\webapps\"
-            File /nonfatal /a /r "I2P\config\webapps\"
-
-            createDirectory "$I2PINSTEXE\geoip\"
-            SetOutPath "$I2PINSTEXE\geoip\"
-            File /nonfatal /a /r "I2P\config\geoip\"
-
-            createDirectory "$I2PINSTEXE\certificates\"
-            SetOutPath "$I2PINSTEXE\certificates\"
-            File /nonfatal /a /r "I2P\config\certificates\"
           ${EndIf}  
         ${Else}
           File /nonfatal /a /r "I2P\"
@@ -270,66 +242,30 @@ Section Install
 
           createDirectory "$I2PINSTEXE\"
           SetOutPath "$I2PINSTEXE\"
+          File /nonfatal /a /r "I2P/config/*"
 
-          createDirectory "$I2PINSTEXE\webapps\"
-          SetOutPath "$I2PINSTEXE\webapps\"
-          File /nonfatal /a /r "I2P\config\webapps\"
-
-          createDirectory "$I2PINSTEXE\geoip\"
-          SetOutPath "$I2PINSTEXE\geoip\"
-          File /nonfatal /a /r "I2P\config\geoip\"
-
-          createDirectory "$I2PINSTEXE\certificates\"
-          SetOutPath "$I2PINSTEXE\certificates\"
-          File /nonfatal /a /r "I2P\config\certificates\"
         ${EndIf}
     ${EndIf}
 
     # Install the launcher scripts
-    createDirectory "$INSTDIR\licenses"
+    createDirectory "$INSTDIR"
     SetOutPath "$INSTDIR"
-    File win/i2pbrowser.bat
-    File win/i2pbrowser-private.bat
-    File win/i2pconfig.bat
+    File "win/*"
 
     # Install the licenses
     createDirectory "$INSTDIR\licenses"
     SetOutPath "$INSTDIR\licenses"
-    File /r licenses\*.*
+    File /a /r "licenses/*"
 
     # Install the profile
     createDirectory "$INSTDIR\firefox.profile.i2p"
     SetOutPath "$INSTDIR\firefox.profile.i2p"
-    File profile\user.js
-    File profile\prefs.js
-    File profile\bookmarks.html
-    File profile\storage-sync.sqlite
-
-    # Install the extensions
-    createDirectory "$INSTDIR\firefox.profile.i2p\extensions"
-    SetOutPath "$INSTDIR\firefox.profile.i2p\extensions"
-    File "profile\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-    File profile\extensions\https-everywhere-eff@eff.org.xpi
-    File profile\extensions\i2ppb@eyedeekay.github.io.xpi
+    File /a /r "profile/*"
 
     # Install the config profile
     createDirectory "$INSTDIR\firefox.profile.config.i2p"
     SetOutPath "$INSTDIR\firefox.profile.config.i2p"
-    File app-profile\user.js
-    File app-profile\prefs.js
-    File app-profile\bookmarks.html
-    File app-profile\storage-sync.sqlite
-
-    # Install the config extensions
-    createDirectory "$INSTDIR\firefox.profile.config.i2p\extensions"
-    SetOutPath "$INSTDIR\firefox.profile.config.i2p\extensions"
-    File profile\extensions\https-everywhere-eff@eff.org.xpi
-    File profile\extensions\i2ppb@eyedeekay.github.io.xpi
-
-    # Install the config userChrome
-    createDirectory "$INSTDIR\firefox.profile.config.i2p\chrome"
-    SetOutPath "$INSTDIR\firefox.profile.config.i2p\chrome"
-    File app-profile\chrome\userChrome.css
+    File /a /r "app-profile/*"
 
     SetOutPath "$INSTDIR"
     createDirectory "$SMPROGRAMS\${APPNAME}"
@@ -349,6 +285,9 @@ Section Install
     FileWrite $0 "routerconsole.browser=$\"$INSTDIR\i2pconfig.bat$\""
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
+    FileWrite $0 "router.disableTunnelTesting=false"
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
     FileClose $0
 
     SetShellVarContext current
@@ -366,6 +305,9 @@ Section Install
     createDirectory "$I2PAPPDATA"
     SetOutPath "$I2PAPPDATA"
 
+    IfFileExists "$LOCALAPPDATA\I2P\eepsite\docroot" +2 0
+        File /nonfatal /a /r "I2P\eepsite"
+
     ;# Point the browser config setting in the working config
     FileOpen $0 "$I2PAPPDATA\router.config" a
     FileSeek $0 0 END
@@ -374,6 +316,9 @@ Section Install
     FileWrite $0 "routerconsole.browser=$\"$INSTDIR\i2pconfig.bat$\""
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
+    FileWrite $0 "router.disableTunnelTesting=false"
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
     FileClose $0
 
     createDirectory "$I2PINSTEXE"
@@ -392,7 +337,7 @@ SectionEnd
 Section "uninstall"
 
     # Remove the licenses
-    rmDir /r "$INSTDIR\licenses"
+    rmDir /r "$INSTDIR\"
 
     # Uninstall the launcher scripts
     Delete $INSTDIR\i2pbrowser.bat
@@ -400,31 +345,13 @@ Section "uninstall"
     Delete $INSTDIR\i2pbrowser-private.bat
     Delete $INSTDIR\ui2pbrowser_icon.ico
 
-    # Uninstall the profile
-    Delete $INSTDIR\firefox.profile.i2p\prefs.js
-    Delete $INSTDIR\firefox.profile.i2p\user.js
-    Delete $INSTDIR\firefox.profile.i2p\bookmarks.html
-    Delete $INSTDIR\firefox.profile.i2p\storage-sync.sqlite
-
-    Delete $INSTDIR\firefox.profile.config.i2p\prefs.js
-    Delete $INSTDIR\firefox.profile.config.i2p\user.js
-    Delete $INSTDIR\firefox.profile.config.i2p\bookmarks.html
-    Delete $INSTDIR\firefox.profile.config.i2p\storage-sync.sqlite
-
-    # Uninstall the extensions
-    Delete "$INSTDIR\firefox.profile.i2p\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-    Delete "$INSTDIR\firefox.profile.i2p\extensions\https-everywhere-eff@eff.org.xpi"
-    Delete "$INSTDIR\firefox.profile.i2p\extensions\i2ppb@eyedeekay.github.io.xpi"
-
-    Delete "$INSTDIR\firefox.profile.config.i2p\extensions\https-everywhere-eff@eff.org.xpi"
-    Delete "$INSTDIR\firefox.profile.config.i2p\extensions\i2ppb@eyedeekay.github.io.xpi"
-
-    Delete "$INSTDIR\firefox.profile.config.i2p\config\userChrome.css"
-
     # Remove shortcuts and folders
     Delete "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
     Delete "$SMPROGRAMS\${APPNAME}\Private Browsing-${APPNAME}.lnk"
     Delete "$SMPROGRAMS\Uninstall-${APPNAME}.lnk"
+    Delete "$SMPROGRAMS\${APPNAME}\Browse I2P.lnk"
+    Delete "$DESKTOP\Browse I2P - Temporary Identity.lnk"
+    Delete "$DESKTOP\Browse I2P.lnk"
     Delete "$DESKTOP\${APPNAME}.lnk"
     Delete "$DESKTOP\Private Browsing-${APPNAME}.lnk"
     rmDir "$SMPROGRAMS\${APPNAME}"
@@ -452,9 +379,9 @@ Function LaunchLink
   ${If} ${Silent}
     ReadEnvStr $0 RESTART_I2P
     ${If} $0 != ""
-      Exec "$INSTDIR\i2pbrowser.bat"
+      ShellExecAsUser::ShellExecAsUser "open" "$DESKTOP\Browse I2P.lnk"
     ${EndIf}  
   ${Else}
-    Exec "$INSTDIR\i2pbrowser.bat"
+    ShellExecAsUser::ShellExecAsUser "open" "$DESKTOP\Browse I2P.lnk"
   ${EndIf}
 FunctionEnd

src/nsis/i2pbrowser-jpackage.nsi

@@ -1 +1 @@
-!define I2P_VERSION 0.9.50
+!define I2P_VERSION 1.7.0

src/nsis/i2pbrowser-version.nsi

@@ -1,3 +1,3 @@
 !define VERSIONMAJOR 1
-!define VERSIONMINOR 05
-!define VERSIONBUILD 0
+!define VERSIONMINOR 07
+!define VERSIONBUILD 1

src/profile/prefs.js

@@ -58,3 +58,6 @@ 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("fission.autostart", true);
+user_pref("gfx.webrender.all", false);
+user_pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false);

src/profile/user.js

@@ -1,19 +1,15 @@
-# 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.
+//# 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:
+//# 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
+//# 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");
@@ -222,3 +218,6 @@ 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("fission.autostart", true);
+user_pref("gfx.webrender.all", false);
+user_pref("privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts", false);

src/profile/version.txt

@@ -1 +1 @@
-1.05.0
+1.07.1

src/win/i2pbrowser-private.bat

@@ -1,17 +1,22 @@
 @echo on
 
+set "I2PPath=%ProgramFiles%\I2P\"
 if exist "%ProgramFiles%\I2P\" (
   set "I2PPath=%ProgramFiles%\I2P\"
 )
 
-if exist "%ProgramFiles(x86)%\I2P" {
+if exist "%ProgramFiles(x86)%\I2P" (
   set "I2PPath=%ProgramFiles(x86)%\I2P"
-}
+)
 
-if exist "%ProgramFiles%\I2P\jpackaged" (
-  start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"
-) else (
-  start "i2p" "%I2PPath%\i2p.exe"
+netstat /o /a | find /i "listening" | find ":7657" >nul 2>nul && (
+   echo I2P is already running
+) || (
+  if exist "%ProgramFiles%\I2P\jpackaged" (
+    start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"
+  ) else (
+    start "i2p" "%I2PPath%\i2p.exe"
+  )
 )
 
 timeout /t 3

src/win/i2pbrowser.bat

@@ -1,19 +1,27 @@
 @echo on
 
+set "I2PPath=%ProgramFiles%\I2P\"
 if exist "%ProgramFiles%\I2P\" (
   set "I2PPath=%ProgramFiles%\I2P\"
 )
 
-if exist "%ProgramFiles(x86)%\I2P" {
+if exist "%ProgramFiles(x86)%\I2P" (
   set "I2PPath=%ProgramFiles(x86)%\I2P"
-}
-
-if exist "%ProgramFiles%\I2P\jpackaged" (
-  start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"
-) else (
-  start "i2p" "%I2PPath%\i2p.exe"
 )
 
+netstat /o /a | find /i "listening" | find ":7657" >nul 2>nul && (
+   echo I2P is already running
+) || (
+  if exist "%ProgramFiles%\I2P\jpackaged" (
+    start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"
+  ) else (
+    start "i2p" "%I2PPath%\i2p.exe"
+  )
+)
+
+
+
+
 timeout /t 3
 
 if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (

src/win/i2pconfig.bat

@@ -2,12 +2,25 @@
 
 if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\" (
   echo "profile is configured"
-  xcopy /s /i /y "$INSTDIR\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
+  xcopy /s /i /y "%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
 ) else (
   echo "configuring profile"
-  xcopy /s /i /y "$INSTDIR\firefox.profile.config.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p"
+  xcopy /s /i /y "%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.config.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p"
 )
 
-start "i2pconfig" "c:\Program Files\Mozilla Firefox\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1
+if exist "%ProgramFiles%\Mozilla Firefox\firefox.exe" (
+  start "i2pbrowser" "%ProgramFiles%\Mozilla Firefox\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1
+  exit
+)
+
+if exist "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" (
+  start "i2pbrowser" "%USERPROFILE%/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1
+  exit
+)
+
+if exist "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" (
+  start "i2pbrowser" "%USERPROFILE%/OneDrive/Desktop/Tor Browser/Browser/firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1
+  exit
+)
 
 exit