eliminate extra quote from launchi2p.bat

update router version
make i2pIsRunning behavior consistent for both tests
2022-06-06 00:23:47 -04:00 · 2022-05-23 16:48:11 -04:00 · 2022-05-20 18:46:34 -04:00 · 2022-05-20 18:44:39 -04:00 · 2022-05-20 18:42:35 -04:00 · 2022-05-20 18:21:49 -04:00
49 changed files with 1796 additions and 670 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,8 +2,20 @@ build
 *.deb
 *.tgz
 ./I2P/
+I2P/
 i2pversion_override
 *.crl
 *.crt
 *.pem
 *.p12
+.stfolder
+*.url
+.vscode
+.version
+*.su3
+*.su3.torrent
+*.exe
+*.log
+cmd
+*.so
+*.jar
--- a/346
+++ b/346
@ -3,48 +3,68 @@

 -include config.mk

-preset=`rm .version; make .version`
+preset=`rm .version; make version`

-include .version
+-include .version

 PROFILE_VERSION=$(MAJOR).$(MINOR).$(BUILD)

-all: .version install.exe
+all: version prep install.exe

 tag:
 	git tag $(PROFILE_VERSION)

-.version:
+version:
+	echo !define VERSIONMAJOR $(VERSIONMAJOR) > src/nsis/i2pbrowser-version.nsi
+	echo !define VERSIONMINOR $(VERSIONMINOR) >> src/nsis/i2pbrowser-version.nsi
+	echo !define VERSIONBUILD $(VERSIONBUILD) >> src/nsis/i2pbrowser-version.nsi
 	sed 's|!define VERSION||g' src/nsis/i2pbrowser-version.nsi | sed 's| |=|g' > .version
-	make version.txt src/nsis/i2pbrowser_jpackage.nsi
+	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

-src/nsis/i2pbrowser_jpackage.nsi:
-	echo "!define I2P_VERSION $(I2P_VERSION)" > src/nsis/i2pbrowser_jpackage.nsi
+i2pbrowser-jpackage.nsi:
+	echo "!define I2P_VERSION $(PROFILE_VERSION)" > src/nsis/i2pbrowser-jpackage.nsi

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

-help: .version
+help: version
 	@echo "I2P-Profile-Installer-$(PROFILE_VERSION)"
 	@echo "$(SIGNER)"
 	@echo "$(I2P_VERSION)"
 	@echo "$(MAJOR).$(MINOR).$(BUILD)"
 	@echo "$(preset)"

-prep: profile.tgz app-profile.tgz profile build/licenses build/I2P build/I2P/config launchers
+prep: #launchers build/licenses profile.tgz app-profile.tgz profile build/I2P build/I2P/config #
+	make launchers
+	echo "launchers" >make.log
+	make build/licenses
+	echo "licenses" >make.log
+	make profile.tgz
+	echo "profilezip" >make.log
+	make app-profile.tgz
+	echo "appprofile" >make.log
+	make profile 
+	echo "profile" >make.log
+	make build/I2P
+	echo "buildi2p" >make.log
+	make build/I2P/config
+	echo "buildi2pconfig" >make.log
 	cp src/nsis/*.nsi build
+	echo "nsi1" >make.log
 	cp src/nsis/*.nsh build
+	echo "nsi2" >make.log
 	cp src/icons/*.ico build

-install.exe: prep
+install.exe: #build/licenses
 	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
@ -53,22 +73,20 @@ distclean: clean clean-extensions
 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/
 	cp -v $(RES_DIR)/i2ptunnel.config src/I2P/config/
 	cp -v $(RES_DIR)/wrapper.config src/I2P/config/
 	#grep -v 'router.updateURL' $(RES_DIR)/router.config > src/I2P/config/router.config
-	cat router.config >> src/I2P/config/router.config
+	cat router.config > src/I2P/config/router.config
 	cp -v $(RES_DIR)/hosts.txt src/I2P/config/hosts.txt
 	cp -R $(RES_DIR)/certificates src/I2P/config/certificates
 	cp -R $(RES_DIR)/eepsite src/I2P/config/eepsite
@ -77,10 +95,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 
-	make src/I2P/config; true
-	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
@ -91,287 +109,57 @@ build/licenses: build
 	mkdir -p build/licenses
 	cp license/* build/licenses
 	cp LICENSE.md build/licenses/MIT.txt
-	unix2dos build/licenses/LICENSE.index
+	cat build/licenses/LICENSE.index \
+		build/licenses/EPL.txt \
+		build/licenses/GPL+CLASSPATH.txt \
+		build/licenses/HTTPS-Everywhere.txt \
+		build/licenses/LICENSE.tor \
+		build/licenses/MIT.txt \
+		build/licenses/MPL2.txt \
+		build/licenses/NoScript.txt \
+		build/licenses/NSS.txt \
+		build/licenses/I2P.txt > build/licenses/LICENSE.txt
+	unix2dos build/licenses/LICENSE.txt

 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 make.log
+	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/3887295/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url
-#
-#	TODO: switch to the "Rhizome" variant which has extended permission to do things like set the homepage.
-#	@echo "https://addons.mozilla.org/firefox/downloads/file/3799074/"`./amo-version.sh i2pipb-rhizome-variant`"/i2prhz@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)"
-	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)
-
-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.su3" i2pwinupdate.su3
-
-i2pwinupdate.su3.torrent: prepupdate
-	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
-
 MAGNET=`bttools torrent printinfo i2pwinupdate.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`
-
-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
+MAGNET_TESTING=`bttools torrent printinfo i2pwinupdate-testing.su3.torrent | grep 'MagNet' | sed 's|MagNet: ||g' | sed 's|%3A|:|g'| sed 's|%2F|/|g'`

 BLANK=`awk '! NF { print NR; exit }' changelog.txt`

 I2P.zip: I2P-jpackage-windows-$(I2P_VERSION).zip

 I2P-jpackage-windows-$(I2P_VERSION).zip:
-	zip I2P-jpackage-windows-$(I2P_VERSION).zip -r I2P
+	zip I2P-jpackage-windows-$(I2P_VERSION).zip -r build/I2P

 changelog:
 	head -n "$(BLANK)" changelog.txt
--- a/README.md
+++ b/README.md
@ -4,33 +4,41 @@ I2P Browsing Profile for Firefox
 Features:
 ---------

- - Automatically select an up-to-date, secure Firefox or Tor Browser(On Windows) variant
- - Automatically configure a profile for I2P
- - Automatically block-list all non-I2P local destinations
- - Enable first-party isolation, anti-fingerprinting, letterboxing
- - Automatically sandbox I2P, Non-I2P, and I2P-Application cookiestores
+- Automatically select an up-to-date, secure Firefox or Tor Browser(On Windows) variant
+- Automatically configure a profile for I2P
+- Automatically block-list all non-I2P local destinations
+- Enable first-party isolation, anti-fingerprinting, letterboxing
+- 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) :

- * make
- * nsis
- * dos2unix
- * curl
- * jq
+- make
+- nsis
+- dos2unix
+- 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`.

- * checkinstall
+```sh
+cp -rv Plugins/* /usr/share/nsis/Plugins/
+```
+
+To build a Debian package, you'll also need
+
+- checkinstall

 Preparation
 -----------

 Before you build, run the targets

-
        make clean-extensions
        make extensions

@ -51,6 +59,14 @@ console wrapper.
 install.exe - the windows installer, which sets up shortcuts to
 launch Firefox on Windows.

+When generating a Windows build it's important to make sure that the
+licenses for all the bundled softare are included. This should happen
+automatically. When bundling software, describe the terms and where
+they are applied in the `LICENSE.index`, then add the full license
+to the `licenses` directory. Then, add the full license to the `cat`
+command in the `build/licenses` make target. The build/licenses
+target is run automatically during the build process.
+
 Unix Support
 ------------

@ -90,8 +106,8 @@ with `sudo service i2p start` then you can run the script:

        /usr/local/bin/i2p-config-service-setup

-Including a jpackaged I2P Router(EXPERIMENTAL)
----------------------------------------------
+Including a jpackaged I2P Router
+--------------------------------

 In order to include a jpackaged(dependency-free) I2P router in the Profile
 Bundle you will need to build the jpackaged I2P router as an "App Image" on
@ -159,6 +175,9 @@ you should select "Checkout as is, commit as is" and leave line-endings alone.
 End-to-End Windows build process using Cygwin
 ---------------------------------------------

+I highly recommend you look into the Chocolatey package manager, which makes it much
+easier to configure these tools and keep them up to date.
+
 **Prerequisites:** You need to have OpenJDK 14 or greater installed and configured
 with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on
 your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%`
@ -169,27 +188,26 @@ select "Checkout as is, commit as is" and leave line-endings alone.

 TODO: Add links to the respective instructions for each of these.

- 1. Run the Cygwin `setup-$arch.exe` for your platform to set up new packages.
-   Select the `make` `jq` `dos2unix` and `curl` packages.
- 2. Open a cygwin terminal.
- 3. Clone `i2p.i2p` and `i2p.firefox`
+1. Run the Cygwin `setup-$arch.exe` for your platform to set up new packages. Select the `make` `jq` `dos2unix` and `curl` packages.
+2. Open a cygwin terminal.
+3. Clone `i2p.i2p` and `i2p.firefox`

        git clone https://github.com/i2p/i2p.i2p
        git clone https://github.com/i2p/i2p.firefox

- 3. Move to the i2p.i2p directory. Build the .jar files required to build the App Image
+4. Move to the i2p.i2p directory. Build the .jar files required to build the App Image
  inside i2p.i2p. Return to home.

        cd i2p.i2p
        ant clean pkg
        cd ..

- 4. Move into the i2p.firefox directory. Run the `./build.sh` script.
+5. Move into the i2p.firefox directory. Run the `./build.sh` script.

        cd i2p.firefox
        ./build.sh

- 5. Run `make` to build the installer.
+6. Run `make` to build the installer.

 Doing a Release
 ---------------
@ -199,25 +217,29 @@ do a release. As a final step, someone must sign the `.exe` file using a
 Certificate which Windows will recognize. The current signer of the Windows
 bundle is Zlatinb. Standard Windows signing tools are used.

+```sh
+# Release Copypasta
+./clean.sh
+wsl make distclean
+wsl make clean-extensions
+wsl make extensions
+./build.sh
+wsl make
+./sign.sh
+```
+
 Building a signed update file
 -----------------------------

 Building a signed update file for automatically updating a Windows I2P router
-requires you to also have Go installed in your Cygwin or WSL environment.
-With WSL, you can do this using the command:
+requires you to either be using linux, or have Go installed in your Cygwin or WSL environment.
+On Linux(Where I sign the su3 files), this works:

-        wsl sudo apt-get install golang-go
+        make su3

-With that dependency satisfied, you can then run:
-
-        wsl make su3
-
-to build the signing tool if necessary and then package the installer in a
+to run the signing tool if necessary and then package the installer in a
 signed update file.

-It's also probably possible to do this with the Java I2P distribution and a
-`.bat` script.
-
 Docker Support
 --------------

@ -256,5 +278,3 @@ HTTPS Everywhere is developed on Github by the EFF:
 I2P in Private Browsing is developed on Gitlab and Github by idk and the community:
 - https://i2pgit.org/idk/I2P-in-Private-Browsing-Mode-Firefox
 - https://github.com/eyedeekay/I2P-in-Private-Browsing-Mode-Firefox
-
-
--- a/amo-version.sh
+++ b/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 '"'

--- a/build.sh
+++ b/build.sh
@ -1,12 +1,23 @@
 #!/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

+. config.sh
+
+if [ -f config_overide.sh ]; then
+  . config_override.sh
+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
@ -15,35 +26,52 @@ if [ "$JAVA" -lt "14" ]; then
 fi
 if [ "$JAVA" -lt "17" ]; then
  echo "It is highly recommended that you use Java 17+ to build release packages"
-  sleep 5s
 fi
-sleep 2s

 if [ -z "${JAVA_HOME}" ]; then
  JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
-  echo "Building with: $JAVA, $JAVA_HOME"
 fi
-
-echo "cleaning"
-./clean.sh
+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"
-cd "$HERE/../i2p.i2p/"
-git checkout "$VERSION"
-ant distclean preppkg-windows || true
+if [ ! -d "$HERE/../i2p.i2p.jpackage-build/" ]; then
+  git clone -b "$VERSION" https://i2pgit.org/i2p-hackers/i2p.i2p "$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"
-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
+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

 cd java
-"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE"/build/i2p.jar:"$HERE"/build/router.jar:"$HERE"/build/routerconsole.jar net/i2p/router/WinLauncher.java net/i2p/router/WindowsUpdatePostProcessor.java net/i2p/router/WinUpdateProcess.java
+"$JAVA_HOME"/bin/javac -d ../build -classpath "$HERE/build/jna.jar":"$HERE/build/jna-platform.jar":"$HERE/build/i2p.jar":"$HERE/build/router.jar":"$HERE/build/routerconsole.jar" \
+  net/i2p/router/Elevator.java \
+  net/i2p/router/Shell32X.java \
+  net/i2p/router/WinLauncher.java \
+  net/i2p/router/WindowsUpdatePostProcessor.java \
+  net/i2p/router/WinUpdateProcess.java
+
 cd ..

 #echo "building launcher.jar"
@ -63,7 +91,11 @@ echo "preparing to invoke jpackage for I2P version $I2P_VERSION"
  --java-options "--add-opens java.base/java.lang=ALL-UNNAMED" \
  --java-options "--add-opens java.base/sun.nio.fs=ALL-UNNAMED" \
  --java-options "--add-opens java.base/java.nio=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/java.util.Properties=ALL-UNNAMED" \
+  --java-options "--add-opens java.base/java.util.Properties.defaults=ALL-UNNAMED" \
  $JPACKAGE_OPTS \
  --resource-dir build \
-  --java-options "--illegal-access=permit" \
  --input build --main-jar launcher.jar --main-class net.i2p.router.WinLauncher
+
+cp "$I2P_PKG/licenses/"* license/
+cp "$HERE/../i2p.i2p.jpackage-build/LICENSE.txt" license/I2P.txt
--- a/changelog.txt
+++ b/changelog.txt
@ -1,3 +1,33 @@
+2022-05-8 idk
+ * Add translations for Arabic, German, French, Italian, Japanese, Portuguese, Russian,
+ and Chinese.
+ * Add support for I2P+ Router Console detection. Not an endorsement of I2P+, just
+ a convenience requested by a helpful user.
+ * The build system has been radically improved in order to be simpler to set up and
+ configure.
+ * Fixed a bug where the build deleted a config file.
+
+2022-05-5 idk
+ * Fix a bug where the I2P router detection inappropriately prioritized an easy
+  install bundle when a non-bundled instal was in use.
+
+2022-03-25 idk
+ * This release adds support for user-mode, non-privileged installation of the
+  jpackaged router and the browser profile. Admin installation is still supported
+  and detected automatically, to support existing bundles.
+ * On restart to update, will detect if a router requires admin rights to install
+  and will ask the user to authorize the update. In user-mode, no prompt will ever
+  be seen.
+ * Updates to the Firefox profiles to improve compatibility with more Firefoxes
+
+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
--- a/clean.sh
+++ b/clean.sh
@ -1,5 +1,14 @@
 #! /usr/bin/env sh

+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "$SCRIPT_DIR" || exit 1
+
+here=$(pwd)
+cd ../i2p.i2p.jpackage-build/
+ant distclean
+git checkout .
+git checkout master
+cd "$here"
 rm -rf \
 	build \
 	eventlog.txt \
@ -14,4 +23,5 @@ rm -rf \
 	wrapper.log \
 	*.jar \
 	*.exe \
-	*.dmg
+	*.dmg
+make clean
--- a/config.sh
+++ b/config.sh
@ -0,0 +1,50 @@
+
+## If you need to use a different JVM, JDK, or other utility from
+# build.sh, set it in this file, for example:
+
+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):
+
+#export PATH="$PATH:/c/Program Files/Java/jdk-18.0.1/bin/"
+#export JAVA_HOME="/c/Program Files/Java/jdk-18.0.1"
+#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/"
+
+# Uncomment this to add signtool to the path so you don't have to fight with Visual Studio.
+export PATH="$PATH:/c/Program Files (x86)/Windows Kits/10/App Certification Kit/"
--- a/daily.sh
+++ b/daily.sh
@ -0,0 +1,41 @@
+#! /usr/bin/env sh
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "$SCRIPT_DIR" || exit 1
+
+### 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 .
+./unsigned.sh
+
+. "$HOME/github-release-config.sh"
+
+. ./i2pversion
+
+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"
+fi
+
+echo github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+github-release release -p -u "$GITHUB_USERNAME" -r "i2p.firefox" -n "$TODAYSDATE" -d "$DESCRIPTION" -t "$TODAYSDATE"
+EXECHECKSUM=$(sha256sum "I2P-Profile-Installer-$I2P_VERSION.exe")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Profile-Installer-$I2P_VERSION.exe" -l "$EXECHECKSUM" -t "$TODAYSDATE" -n "I2P-Profile-Installer-$I2P_VERSION.exe"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "I2P-Profile-Installer-$I2P_VERSION.exe" -l "$EXECHECKSUM" -t "$TODAYSDATE" -n "I2P-Profile-Installer-$I2P_VERSION.exe"
+cd build || exit
+tar -a -cf ../I2P.zip I2P
+ZIPCHECKSUM=$(sha256sum "../I2P.zip")
+echo github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
+github-release upload -R -u "$GITHUB_USERNAME" -r "i2p.firefox" -f "../I2P.zip" -l "$ZIPCHECKSUM" -t "$TODAYSDATE" -n "I2P.zip"
--- a/17
+++ b/17
@ -1,15 +1,20 @@
 #! /usr/bin/env sh

+JNA_VERSION=5.11.0
+export JNA_VERSION=5.11.0

 #Comment this out to build from an alternate branch or
 # the tip of the master branch.
-I2P_VERSION=1.6.1
-export I2P_VERSION=1.6.1
-VERSION=i2p-"$I2P_VERSION"
-export VERSION="$VERSION"
+VERSIONMAJOR=1
+VERSIONMINOR=8
+VERSIONBUILD=0
+I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+export I2P_VERSION="$VERSIONMAJOR.$VERSIONMINOR.$VERSIONBUILD"
+VERSION=i2p-1.8.0
+export VERSION=i2p-1.8.0

 #Uncomment this to build from the tip of the master.
-#I2P_VERSION=0.9.50
-#export I2P_VERSION=0.9.50
+#I2P_VERSION=1.8.0
+#export I2P_VERSION=1.8.0
 #VERSION=master
 #export VERSION="$VERSION"
--- a/java/net/i2p/router/Elevator.java
+++ b/java/net/i2p/router/Elevator.java
@ -0,0 +1,33 @@
+package net.i2p.router;
+
+import com.sun.jna.WString;
+import com.sun.jna.platform.win32.Kernel32;
+import com.sun.jna.platform.win32.Kernel32Util;
+
+public class Elevator {
+    public static void main(String... args) {
+        executeAsAdministrator("c:\\windows\\system32\\notepad.exe", "");
+    }
+
+    public static void executeAsAdministrator(String command, String args) {
+        if (command == "" || command == null) {
+            System.out.println("No command specified");
+            return;
+        }
+        Shell32X.SHELLEXECUTEINFO execInfo = new Shell32X.SHELLEXECUTEINFO();
+        execInfo.lpFile = new WString(command);
+        if (args != null)
+            execInfo.lpParameters = new WString(args);
+        execInfo.nShow = Shell32X.SW_SHOWDEFAULT;
+        execInfo.fMask = Shell32X.SEE_MASK_NOCLOSEPROCESS;
+        execInfo.lpVerb = new WString("runas");
+        boolean result = Shell32X.INSTANCE.ShellExecuteEx(execInfo);
+
+        if (!result) {
+            int lastError = Kernel32.INSTANCE.GetLastError();
+            String errorMessage = Kernel32Util.formatMessageFromLastErrorCode(lastError);
+            throw new RuntimeException("Error performing elevation: " + lastError + ": " + errorMessage + " (apperror="
+                    + execInfo.hInstApp + ")");
+        }
+    }
+}
--- a/java/net/i2p/router/Shell32X.java
+++ b/java/net/i2p/router/Shell32X.java
@ -0,0 +1,111 @@
+package net.i2p.router;
+
+import java.util.*;
+
+import com.sun.jna.Native;
+import com.sun.jna.Pointer;
+import com.sun.jna.Structure;
+import com.sun.jna.WString;
+import com.sun.jna.platform.win32.Shell32;
+import com.sun.jna.platform.win32.WinDef.HINSTANCE;
+import com.sun.jna.platform.win32.WinDef.HWND;
+import com.sun.jna.platform.win32.WinNT.HANDLE;
+import com.sun.jna.platform.win32.WinReg.HKEY;
+import com.sun.jna.win32.W32APIOptions;
+
+public interface Shell32X extends Shell32 {
+    Shell32X INSTANCE = (Shell32X) Native.loadLibrary("shell32", Shell32X.class, W32APIOptions.UNICODE_OPTIONS);
+
+    int SW_HIDE = 0;
+    int SW_MAXIMIZE = 3;
+    int SW_MINIMIZE = 6;
+    int SW_RESTORE = 9;
+    int SW_SHOW = 5;
+    int SW_SHOWDEFAULT = 10;
+    int SW_SHOWMAXIMIZED = 3;
+    int SW_SHOWMINIMIZED = 2;
+    int SW_SHOWMINNOACTIVE = 7;
+    int SW_SHOWNA = 8;
+    int SW_SHOWNOACTIVATE = 4;
+    int SW_SHOWNORMAL = 1;
+
+    /** File not found. */
+    int SE_ERR_FNF = 2;
+
+    /** Path not found. */
+    int SE_ERR_PNF = 3;
+
+    /** Access denied. */
+    int SE_ERR_ACCESSDENIED = 5;
+
+    /** Out of memory. */
+    int SE_ERR_OOM = 8;
+
+    /** DLL not found. */
+    int SE_ERR_DLLNOTFOUND = 32;
+
+    /** Cannot share an open file. */
+    int SE_ERR_SHARE = 26;
+
+    int SEE_MASK_NOCLOSEPROCESS = 0x00000040;
+
+    int ShellExecute(int i, String lpVerb, String lpFile, String lpParameters, String lpDirectory, int nShow);
+
+    boolean ShellExecuteEx(SHELLEXECUTEINFO lpExecInfo);
+
+    public static class SHELLEXECUTEINFO extends Structure {
+        /*
+         * DWORD cbSize;
+         * ULONG fMask;
+         * HWND hwnd;
+         * LPCTSTR lpVerb;
+         * LPCTSTR lpFile;
+         * LPCTSTR lpParameters;
+         * LPCTSTR lpDirectory;
+         * int nShow;
+         * HINSTANCE hInstApp;
+         * LPVOID lpIDList;
+         * LPCTSTR lpClass;
+         * HKEY hkeyClass;
+         * DWORD dwHotKey;
+         * union {
+         * HANDLE hIcon;
+         * HANDLE hMonitor;
+         * } DUMMYUNIONNAME;
+         * HANDLE hProcess;
+         */
+
+        public int cbSize = size();
+        public int fMask;
+        public HWND hwnd;
+        public WString lpVerb;
+        public WString lpFile;
+        public WString lpParameters;
+        public WString lpDirectory;
+        public int nShow;
+        public HINSTANCE hInstApp;
+        public Pointer lpIDList;
+        public WString lpClass;
+        public HKEY hKeyClass;
+        public int dwHotKey;
+
+        /*
+         * Actually:
+         * union {
+         * HANDLE hIcon;
+         * HANDLE hMonitor;
+         * } DUMMYUNIONNAME;
+         */
+        public HANDLE hMonitor;
+        public HANDLE hProcess;
+
+        protected List getFieldOrder() {
+            return Arrays.asList(new String[] {
+                    "cbSize", "fMask", "hwnd", "lpVerb", "lpFile", "lpParameters",
+                    "lpDirectory", "nShow", "hInstApp", "lpIDList", "lpClass",
+                    "hKeyClass", "dwHotKey", "hMonitor", "hProcess",
+            });
+        }
+    }
+
+}
--- a/java/net/i2p/router/WinLauncher.java
+++ b/java/net/i2p/router/WinLauncher.java
@ -1,7 +1,12 @@
 package net.i2p.router;

 import java.io.*;
+import java.net.InetAddress;
+import java.net.Socket;
 import java.util.*;
+import java.util.logging.FileHandler;
+import java.util.logging.Logger;
+import java.util.logging.SimpleFormatter;

 import net.i2p.crypto.*;

@ -17,21 +22,38 @@ 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();
+    static Logger logger = Logger.getLogger("launcherlog");
+    static FileHandler fh;
+
    public static void main(String[] args) throws Exception {
-        File programs = wupp.selectProgramFile();
+        try {
+            // This block configure the logger with handler and formatter
+            fh = new FileHandler(logFile().toString());
+            logger.addHandler(fh);
+            SimpleFormatter formatter = new SimpleFormatter();
+            fh.setFormatter(formatter);
+            // the following statement is used to log any messages
+            logger.info("My first log");
+        } catch (SecurityException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        File programs = selectProgramFile();
        if (!programs.exists())
            programs.mkdirs();
        else if (!programs.isDirectory()) {
-            System.err.println(programs + " exists but is not a directory. Please get it out of the way");
+            logger.warning(programs + " exists but is not a directory. Please get it out of the way");
            System.exit(1);
        }

@ -39,42 +61,77 @@ public class WinLauncher {
        if (!home.exists())
            home.mkdirs();
        else if (!home.isDirectory()) {
-            System.err.println(home + " exists but is not a directory. Please get it out of the way");
+            logger.warning(home + " exists but is not a directory. Please get it out of the way");
            System.exit(1);
        }

+        if (i2pIsRunning()) {
+            logger.warning("I2P is already running");
+            System.exit(0);
+        }
+
        System.setProperty("i2p.dir.base", programs.getAbsolutePath());
        System.setProperty("i2p.dir.config", home.getAbsolutePath());
        System.setProperty("router.pid", String.valueOf(ProcessHandle.current().pid()));
-        System.out.println("\t"+System.getProperty("i2p.dir.base") +"\n\t"+System.getProperty("i2p.dir.config")+"\n\t"+ System.getProperty("router.pid"));
+        logger.info("\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());
-        System.out.println("Router is configured");
+        // wupp.i2pRouter = new Router(System.getProperties());
+        logger.info("Router is configured");

        Thread registrationThread = new Thread(REGISTER_UPP);
        registrationThread.setName("UPP Registration");
        registrationThread.setDaemon(true);
        registrationThread.start();

-        wupp.i2pRouter.runRouter();
+        // wupp.i2pRouter.runRouter();
+        RouterLaunch.main(args);
+    }
+
+    private static boolean i2pIsRunning() {
+        // check if there's something listening on port 7657
+        // check for the existence of router.ping file, if it's less then 2 minutes old,
+        // exit
+        File home = selectHome();
+        File ping = new File(home, "router.ping");
+        if (ping.exists()) {
+            long diff = System.currentTimeMillis() - ping.lastModified();
+            if (diff < 2 * 60 * 1000) {
+                logger.info("router.ping exists and is less than 2 minutes old, I2P appears to be running already.");
+                return true;
+            }
+        }
+        try {
+            InetAddress localhost = InetAddress.getLocalHost();
+            Socket s = new Socket(localhost, 7657);
+            s.close();
+            return true;
+        } catch (IOException e) {
+            return false;
+        }
    }

    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,21 +145,61 @@ public class WinLauncher {
        }
    }

-    private static File selectHome() { //throws Exception {
+    private static File selectHome() { // throws Exception {
+        String path_override = System.getenv("I2P_CONFIG");
+        if (path_override != null) {
+            File path = new File(path_override);
+            if (path != null && path.exists()) {
+                if (path.isDirectory())
+                    return path.getAbsoluteFile();
+                else
+                    throw new RuntimeException("I2P_CONFIG is not a directory: " + path);
+            }
+        }
        if (SystemVersion.isWindows()) {
            File home = new File(System.getProperty("user.home"));
            File appData = new File(home, "AppData");
            File local = new File(appData, "Local");
            File i2p;
            i2p = new File(local, "I2P");
-            System.out.println("Windows jpackage wrapper started, using: " + i2p + " as base config");
+            logger.info("Windows jpackage wrapper started, using: " + i2p + " as base config");
            return i2p.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 started, using: " + programs + " as base config");
+            logger.info("Linux portable jpackage wrapper started, using: " + programs + " as base config");
            return programs.getAbsoluteFile();
        }
    }

+    private static File selectProgramFile() {
+        String path_override = System.getenv("I2P");
+        if (path_override != null) {
+            File path = new File(path_override);
+            if (path.exists()) {
+                if (path.isDirectory())
+                    return path.getAbsoluteFile();
+                else
+                    throw new RuntimeException("I2P is not a directory: " + path);
+            }
+        }
+        if (SystemVersion.isWindows()) {
+            File jrehome = new File(System.getProperty("java.home"));
+            File programs = jrehome.getParentFile();
+            logger.info("Windows portable jpackage wrapper found, using: " + programs + " as working config");
+            return programs.getAbsoluteFile();
+        } else {
+            File jrehome = new File(System.getProperty("java.home"));
+            File programs = new File(jrehome.getParentFile().getParentFile(), "i2p");
+            logger.info("Linux portable jpackage wrapper found, using: " + programs + " as working config");
+            return programs.getAbsoluteFile();
+        }
+    }
+
+    private static File logFile() {
+        File log = new File(selectProgramFile(), "log");
+        if (!log.exists())
+            log.mkdirs();
+        return new File(log, "launcher.log");
+    }
 }
--- a/java/net/i2p/router/WinUpdateProcess.java
+++ b/java/net/i2p/router/WinUpdateProcess.java
@ -11,20 +11,22 @@ class WinUpdateProcess implements Runnable {
    private final RouterContext ctx;
    private final Supplier<String> versionSupplier;
    private final Supplier<File> fileSupplier;
-    
+    private final Log _log;
+
    WinUpdateProcess(RouterContext ctx, Supplier<String> versionSupplier, Supplier<File> fileSupplier) {
        this.ctx = ctx;
        this.versionSupplier = versionSupplier;
        this.fileSupplier = fileSupplier;
+        this._log = ctx.logManager().getLog(WinUpdateProcess.class);
    }
-    
-    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 workDir;
            } else {
                workDir.mkdirs();
            }
@ -35,38 +37,44 @@ 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");

-        ProcessBuilder pb = new ProcessBuilder(file.getAbsolutePath());
-        var env = pb.environment();
-        env.put("OLD_I2P_VERSION", version);
-        env.remove("RESTART_I2P");
+        if (logFile.canWrite()) {
+            // check if we can write to the log file. If we can, use the ProcessBuilder to
+            // run the installer.
+            ProcessBuilder pb = new ProcessBuilder(file.getAbsolutePath(), "/S", "/D=" + workingDir.getAbsolutePath());
+            var env = pb.environment();
+            env.put("OLD_I2P_VERSION", version);
+            env.remove("RESTART_I2P");

-        int exitCode = ctx.router().scheduledGracefulExitCode();
-        if (exitCode == Router.EXIT_HARD_RESTART || exitCode == Router.EXIT_GRACEFUL_RESTART)
-            env.put("RESTART_I2P", "true");
+            int exitCode = ctx.router().scheduledGracefulExitCode();
+            if (exitCode == Router.EXIT_HARD_RESTART || exitCode == Router.EXIT_GRACEFUL_RESTART)
+                env.put("RESTART_I2P", "true");

-        try {
-            pb.directory(workingDir).
-                redirectErrorStream(true).
-                redirectOutput(logFile).
-                start();
-        } catch (IOException ex) {
-                System.out.println("Unable to run update-program in background. Update will fail.");
+            try {
+                pb.directory(workingDir).redirectErrorStream(true).redirectOutput(logFile).start();
+            } catch (IOException ex) {
+                _log.error("Unable to run update-program in background. Update will fail.");
+            }
+        } else {
+            // If we cant write to the log file and we're on Windows, use the elevator to
+            // execute the installer instead of the ProcessBuilder.
+            Elevator.executeAsAdministrator(file.getAbsolutePath(), " /S /D=" + workingDir.getAbsolutePath());
        }
+
    }

    @Override
    public void run() {
        try {
            runUpdateInstaller();
-        } catch(IOException ioe) {
-            System.out.println("Error running updater, update may fail." + ioe);
+        } catch (IOException ioe) {
+            _log.error("Error running updater, update may fail." + ioe);
        }
    }
 }
--- a/java/net/i2p/router/WindowsUpdatePostProcessor.java
+++ b/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,82 +17,79 @@ 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 (SystemVersion.isWindows()) {

-        if (type != UpdateType.ROUTER_SIGNED_SU3 && type != UpdateType.ROUTER_DEV_SU3) {
-            _log.warn("Unsupported update type " + type);
-            return;
+            if (type != UpdateType.ROUTER_SIGNED_SU3 && type != UpdateType.ROUTER_DEV_SU3) {
+                _log.warn("Unsupported update type " + type);
+                return;
+            }
+
+            if (fileType != SU3File.TYPE_EXE) {
+                _log.warn("Unsupported file type " + fileType);
+                return;
+            }
+
+            this.positionedFile = moveUpdateInstaller(file);
+            this.version = version;
+
+            if (!hook.compareAndSet(false, true)) {
+                _log.info("shutdown hook was already set");
+                return;
+            }
+
+            _log.info("adding shutdown hook");
+
+            ctx.addFinalShutdownTask(new WinUpdateProcess(ctx, this::getVersion, this::getFile));
        }
-
-        if (fileType != SU3File.TYPE_EXE) {
-            _log.warn("Unsupported file type " + fileType);
-            return;
-        }
-        
-        this.positionedFile = moveUpdateInstaller(file);
-        this.version = version;
-        
-        if (!hook.compareAndSet(false,true)) {
-            _log.info("shutdown hook was already set");
-            return;
-        }
-
-        _log.info("adding shutdown hook");
-        ctx.addFinalShutdownTask(new 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 +98,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();
-        }
-    }
-
 }
--- a/license/EPL.txt
+++ b/license/EPL.txt
@ -0,0 +1,88 @@
+
+Eclipse Public License - v 2.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+1. DEFINITIONS
+
+“Contribution” means:
+
+    a) in the case of the initial Contributor, the initial content Distributed under this Agreement, and
+    b) in the case of each subsequent Contributor:
+        i) changes to the Program, and
+        ii) additions to the Program;
+    where such changes and/or additions to the Program originate from and are Distributed by that particular Contributor. A Contribution “originates” from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include changes or additions to the Program that are not Modified Works.
+
+“Contributor” means any person or entity that Distributes the Program.
+
+“Licensed Patents” mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+“Program” means the Contributions Distributed in accordance with this Agreement.
+
+“Recipient” means anyone who receives the Program under this Agreement or any Secondary License (as applicable), including Contributors.
+
+“Derivative Works” shall mean any work, whether in Source Code or other form, that is based on (or derived from) the Program and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship.
+
+“Modified Works” shall mean any work in Source Code or other form that results from an addition to, deletion from, or modification of the contents of the Program, including, for purposes of clarity any new file in Source Code form that contains any contents of the Program. Modified Works shall not include works that contain only declarations, interfaces, types, classes, structures, or files of the Program solely in each case in order to link to, bind by name, or subclass the Program or Modified Works thereof.
+
+“Distribute” means the acts of a) distributing or b) making available in any manner that enables the transfer of a copy.
+
+“Source Code” means the form of a Program preferred for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+“Secondary License” means either the GNU General Public License, Version 2.0, or any later versions of that license, including any exceptions or additional permissions as identified by the initial Contributor.
+2. GRANT OF RIGHTS
+
+    a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, Distribute and sublicense the Contribution of such Contributor, if any, and such Derivative Works.
+    b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in Source Code or other form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+    c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to Distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+    d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+    e) Notwithstanding the terms of any Secondary License, no Contributor makes additional grants to any Recipient (other than those set forth in this Agreement) as a result of such Recipient's receipt of the Program under the terms of a Secondary License (if permitted under the terms of Section 3).
+
+3. REQUIREMENTS
+
+3.1 If a Contributor Distributes the Program in any form, then:
+
+    a) the Program must also be made available as Source Code, in accordance with section 3.2, and the Contributor must accompany the Program with a statement that the Source Code for the Program is available under this Agreement, and informs Recipients how to obtain it in a reasonable manner on or through a medium customarily used for software exchange; and
+    b) the Contributor may Distribute the Program under a license different than this Agreement, provided that such license:
+        i) effectively disclaims on behalf of all other Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+        ii) effectively excludes on behalf of all other Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+        iii) does not attempt to limit or alter the recipients' rights in the Source Code under section 3.2; and
+        iv) requires any subsequent distribution of the Program by any party to be under a license that satisfies the requirements of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+    a) it must be made available under this Agreement, or if the Program (i) is combined with other material in a separate file or files made available under a Secondary License, and (ii) the initial Contributor attached to the Source Code the notice described in Exhibit A of this Agreement, then the Program may be made available under the terms of such Secondary Licenses, and
+    b) a copy of this Agreement must be included with each copy of the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent, trademark, attribution notices, disclaimers of warranty, or limitations of liability (‘notices’) contained within the Program from any copy of the Program which they Distribute, provided that Contributors may add their own appropriate notices.
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor (“Commercial Contributor”) hereby agrees to defend and indemnify every other Contributor (“Indemnified Contributor”) against any losses, damages and costs (collectively “Losses”) arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be Distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to Distribute the Program (including its Contributions) under the new version.
+
+Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. Nothing in this Agreement is intended to be enforceable by any entity that is not a Contributor or Recipient. No third-party beneficiary rights are created under this Agreement.
+Exhibit A – Form of Secondary Licenses Notice
+
+“This Source Code may also be made available under the following Secondary Licenses when the conditions for such availability set forth in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), version(s), and exceptions or additional permissions here}.”
+
+    Simply including a copy of this Agreement, including this Exhibit A is not sufficient to license the Source Code under Secondary Licenses.
+
+    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.
+
--- a/license/GPL+CLASSPATH.txt
+++ b/license/GPL+CLASSPATH.txt
@ -0,0 +1,393 @@
+
+GNU General Public License, version 2,
+with the Classpath Exception
+
+The GNU General Public License (GPL)
+
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license
+document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share
+and change it.  By contrast, the GNU General Public License is intended to
+guarantee your freedom to share and change free software--to make sure the
+software is free for all its users.  This General Public License applies to
+most of the Free Software Foundation's software and to any other program whose
+authors commit to using it.  (Some other Free Software Foundation software is
+covered by the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+When we speak of free software, we are referring to freedom, not price.  Our
+General Public Licenses are designed to make sure that you have the freedom to
+distribute copies of free software (and charge for this service if you wish),
+that you receive source code or can get it if you want it, that you can change
+the software or use pieces of it in new free programs; and that you know you
+can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny
+you these rights or to ask you to surrender the rights.  These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have.  You must
+make sure that they, too, receive or can get the source code.  And you must
+show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software.  If the
+software is modified by someone else and passed on, we want its recipients to
+know that what they have is not the original, so that any problems introduced
+by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents.  We
+wish to avoid the danger that redistributors of a free program will
+individually obtain patent licenses, in effect making the program proprietary.
+To prevent this, we have made it clear that any patent must be licensed for
+everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms of
+this General Public License.  The "Program", below, refers to any such program
+or work, and a "work based on the Program" means either the Program or any
+derivative work under copyright law: that is to say, a work containing the
+Program or a portion of it, either verbatim or with modifications and/or
+translated into another language.  (Hereinafter, translation is included
+without limitation in the term "modification".) Each licensee is addressed as
+"you".
+
+Activities other than copying, distribution and modification are not covered by
+this License; they are outside its scope.  The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made by
+running the Program).  Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as
+you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may
+at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus
+forming a work based on the Program, and copy and distribute such modifications
+or work under the terms of Section 1 above, provided that you also meet all of
+these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating
+    that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in whole or
+    in part contains or is derived from the Program or any part thereof, to be
+    licensed as a whole at no charge to all third parties under the terms of
+    this License.
+
+    c) If the modified program normally reads commands interactively when run,
+    you must cause it, when started running for such interactive use in the
+    most ordinary way, to print or display an announcement including an
+    appropriate copyright notice and a notice that there is no warranty (or
+    else, saying that you provide a warranty) and that users may redistribute
+    the program under these conditions, and telling the user how to view a copy
+    of this License.  (Exception: if the Program itself is interactive but does
+    not normally print such an announcement, your work based on the Program is
+    not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If identifiable
+sections of that work are not derived from the Program, and can be reasonably
+considered independent and separate works in themselves, then this License, and
+its terms, do not apply to those sections when you distribute them as separate
+works.  But when you distribute the same sections as part of a whole which is a
+work based on the Program, the distribution of the whole must be on the terms
+of this License, whose permissions for other licensees extend to the entire
+whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your
+rights to work written entirely by you; rather, the intent is to exercise the
+right to control the distribution of derivative or collective works based on
+the Program.
+
+In addition, mere aggregation of another work not based on the Program with the
+Program (or with a work based on the Program) on a volume of a storage or
+distribution medium does not bring the other work under the scope of this
+License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1 and
+2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable source
+    code, which must be distributed under the terms of Sections 1 and 2 above
+    on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three years, to
+    give any third party, for a charge no more than your cost of physically
+    performing source distribution, a complete machine-readable copy of the
+    corresponding source code, to be distributed under the terms of Sections 1
+    and 2 above on a medium customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer to
+    distribute corresponding source code.  (This alternative is allowed only
+    for noncommercial distribution and only if you received the program in
+    object code or executable form with such an offer, in accord with
+    Subsection b above.)
+
+The source code for a work means the preferred form of the work for making
+modifications to it.  For an executable work, complete source code means all
+the source code for all modules it contains, plus any associated interface
+definition files, plus the scripts used to control compilation and installation
+of the executable.  However, as a special exception, the source code
+distributed need not include anything that is normally distributed (in either
+source or binary form) with the major components (compiler, kernel, and so on)
+of the operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the source
+code from the same place counts as distribution of the source code, even though
+third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License.  Any attempt otherwise to copy, modify,
+sublicense or distribute the Program is void, and will automatically terminate
+your rights under this License.  However, parties who have received copies, or
+rights, from you under this License will not have their licenses terminated so
+long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the Program
+or its derivative works.  These actions are prohibited by law if you do not
+accept this License.  Therefore, by modifying or distributing the Program (or
+any work based on the Program), you indicate your acceptance of this License to
+do so, and all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program),
+the recipient automatically receives a license from the original licensor to
+copy, distribute or modify the Program subject to these terms and conditions.
+You may not impose any further restrictions on the recipients' exercise of the
+rights granted herein.  You are not responsible for enforcing compliance by
+third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License.  If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices.  Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose that
+choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original
+copyright holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded.  In
+such case, this License incorporates the limitation as if written in the body
+of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the
+General Public License from time to time.  Such new versions will be similar in
+spirit to the present version, but may differ in detail to address new problems
+or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any later
+version", you have the option of following the terms and conditions either of
+that version or of any later version published by the Free Software Foundation.
+If the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission.  For software which is copyrighted by the Free Software Foundation,
+write to the Free Software Foundation; we sometimes make exceptions for this.
+Our decision will be guided by the two goals of preserving the free status of
+all derivatives of our free software and of promoting the sharing and reuse of
+software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR
+THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE
+PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE,
+YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
+PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR
+INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER
+OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible
+use to the public, the best way to achieve this is to make it free software
+which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program.  It is safest to attach
+them to the start of each source file to most effectively convey the exclusion
+of warranty; and each file should have at least the "copyright" line and a
+pointer to where the full notice is found.
+
+    One line to give the program's name and a brief idea of what it does.
+
+    Copyright (C) <year> <name of author>
+
+    This program is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the Free
+    Software Foundation; either version 2 of the License, or (at your option)
+    any later version.
+
+    This program is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+    more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc., 59
+    Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it
+starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author Gnomovision comes
+    with ABSOLUTELY NO WARRANTY; for details type 'show w'.  This is free
+    software, and you are welcome to redistribute it under certain conditions;
+    type 'show c' for details.
+
+The hypothetical commands 'show w' and 'show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may be
+called something other than 'show w' and 'show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.  Here
+is a sample; alter the names:
+
+    Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+    'Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+    signature of Ty Coon, 1 April 1989
+
+    Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General Public
+License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL
+
+Certain source files distributed by Oracle America and/or its affiliates are
+subject to the following clarification and special exception to the GPL, but
+only where Oracle has expressly included in the particular source file's header
+the words "Oracle designates this particular file as subject to the "Classpath"
+exception as provided by Oracle in the LICENSE file that accompanied this code."
+
+    Linking this library statically or dynamically with other modules is making
+    a combined work based on this library.  Thus, the terms and conditions of
+    the GNU General Public License cover the whole combination.
+
+    As a special exception, the copyright holders of this library give you
+    permission to link this library with independent modules to produce an
+    executable, regardless of the license terms of these independent modules,
+    and to copy and distribute the resulting executable under terms of your
+    choice, provided that you also meet, for each linked independent module,
+    the terms and conditions of the license of that module.  An independent
+    module is a module which is not derived from or based on this library.  If
+    you modify this library, you may extend this exception to your version of
+    the library, but you are not obligated to do so.  If you do not wish to do
+    so, delete this exception statement from your version.
+
+
+
+
+ADDITIONAL INFORMATION ABOUT LICENSING
+
+Certain files distributed by Oracle America, Inc. and/or its affiliates are
+subject to the following clarification and special exception to the GPLv2,
+based on the GNU Project exception for its Classpath libraries, known as the
+GNU Classpath Exception.
+
+Note that Oracle includes multiple, independent programs in this software
+package.  Some of those programs are provided under licenses deemed
+incompatible with the GPLv2 by the Free Software Foundation and others.
+For example, the package includes programs licensed under the Apache
+License, Version 2.0 and may include FreeType. Such programs are licensed
+to you under their original licenses.
+
+Oracle facilitates your further distribution of this package by adding the
+Classpath Exception to the necessary parts of its GPLv2 code, which permits
+you to use that code in combination with other independent modules not
+licensed under the GPLv2. However, note that this would not permit you to
+commingle code under an incompatible license with Oracle's GPLv2 licensed
+code by, for example, cutting and pasting such code into a file also
+containing Oracle's GPLv2 licensed code and then distributing the result.
+
+Additionally, if you were to remove the Classpath Exception from any of the
+files to which it applies and distribute the result, you would likely be
+required to license some or all of the other code in that distribution under
+the GPLv2 as well, and since the GPLv2 is incompatible with the license terms
+of some items included in the distribution by Oracle, removing the Classpath
+Exception could therefore effectively compromise your ability to further
+distribute the package.
+
+Failing to distribute notices associated with some files may also create
+unexpected legal consequences.
+
+Proceed with caution and we recommend that you obtain the advice of a lawyer
+skilled in open source matters before removing the Classpath Exception or
+making modifications to this package which may subsequently be redistributed
+and/or involve the use of third party software.
+
--- a/license/LICENSE.index
+++ b/license/LICENSE.index
@ -5,11 +5,38 @@ and they are distributed with this package in the "licenses" directory.
  1. MIT License
    * all original material in this repository
  2. Mozilla Public License 2.0(From Mozilla Installer)
-    * ./i2pbrowser-mozcompat.nsi
+    * ./src/win/i2pbrowser-mozcompat.nsi
  3. Modified BSD License(From Tor Browser Bundle)
-    * ./firefox.profile.i2p/user.js
+    * ./src/*/user.js
  4. GNU General Public License 2.0(NoScript and HTTPS Everywhere)
-    * ./firefox.profile.i2p/extensions/
+    * ./src/*/extensions/
  5. GNU General Public License 3.0(Part of HTTPS Everywhere)
-    * ./firefox.profike.i2p/extensions/https-everywhere@eff.org.xpi
+    * ./src/*/extensions/
+  6. GNU GPLv2 With Classpath Exception(Java libraries included via Jpackage)
+    * ./I2P

+Additionally, the Jpackaged I2P Router contains software which is licensed
+under multiple Free/Open Source Software Licenses.
+
+  ABOUT-Jetty.html               LICENSE-ECLIPSE-1.0.html             
+  LICENSE-Addressbook.txt        LICENSE-ElGamalDSA.txt               
+  LICENSE-Apache2.0.txt          LICENSE-FatCowIcons.txt              
+  LICENSE-BlockFile.txt          LICENSE-Feather.txt                  
+  LICENSE-Boost.txt              LICENSE-fontawesome.txt              
+  LICENSE-BSD.txt                LICENSE-forked-subprocess.swift.txt  
+  LICENSE-CC0-1.0-Universal.txt  LICENSE-Foxtrot.txt                  
+  LICENSE-Cryptix.txt            LICENSE-FugueIcons.txt               
+  LICENSE-DesktopGUI.txt         LICENSE-GPLv2.txt                    
+  LICENSE-GPLv3.txt              LICENSE-LGPLv2.1.txt       
+  LICENSE-Launch4j.txt           LICENSE-SilkIcons.txt
+  LICENSE-HashCash.txt           LICENSE-LGPLv3.txt         
+  LICENSE-I2PTunnel.txt          LICENSE-Ministreaming.txt  
+  LICENSE-Identicon.txt          LICENSE-NDT.txt            
+  LICENSE-InstallCert.txt        LICENSE-Noise.txt          
+  LICENSE-jBCrypt.txt            LICENSE-sbt-wrapper.txt    
+  LICENSE-JGoodies-Forms.txt     LICENSE-Scala.md           
+  LICENSE-JGoodies-Looks.txt     LICENSE-SHA256.txt         
+  NOTICE-Tomcat.txt              NOTICE-Jetty.html
+  LICENSE-UPnP.txt               LICENSE-SNTP.txt
+  LICENSE-Wrapper.txt            LICENSE-Undraw.txt
+  LICENSE-XStream.txt            NOTICE-Commons-Logging.txt
--- a/makefiles/app-profile.mk
+++ b/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
--- a/makefiles/build.mk
+++ b/makefiles/build.mk
@ -0,0 +1,40 @@
+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
--- a/makefiles/debian.mk
+++ b/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
--- a/makefiles/docker.mk
+++ b/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
--- a/makefiles/extensions.mk
+++ b/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
--- a/makefiles/install.mk
+++ b/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
--- a/makefiles/new-extensions.mk
+++ b/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
--- a/makefiles/profile.mk
+++ b/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
--- a/makefiles/su-unsigned.mk
+++ b/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
--- a/makefiles/su.mk
+++ b/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" $(PROFILE_VERSION) $(SIGNER)
+
+i2pwinupdate.su3.torrent: prepupdate su3
+	mktorrent \
+		--announce=http://tracker2.postman.i2p/announce.php \
+		--announce=http://w7tpbzncbcocrqtwwm3nezhnnsw4ozadvi2hmvzdhrqzfxfum7wa.b32.i2p/a \
+		--announce=http://mb5ir7klpc2tj6ha3xhmrs3mseqvanauciuoiamx2mmzujvg67uq.b32.i2p/a \
+		i2pwinupdate.su3
+
+torrent: i2pwinupdate.su3.torrent
+
+releases.json:
+	@echo "["		| tee ../i2p.newsxml/data/win/beta/releases.json
+	@echo "  {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"date\": \"$(I2P_DATE)\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"version\": \"$(PROFILE_VERSION)\","	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"minVersion\": \"1.5.0\","			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"minJavaVersion\": \"1.8\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    \"updates\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "      \"su3\": {"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        \"torrent\": \"$(MAGNET)\","		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        \"url\": ["		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "          \"http://ekm3fu6fr5pxudhwjmdiea5dovc3jdi66hjgop4c7z7dfaw7spca.b32.i2p/i2pwinupdate.su3\""	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "        ]"	| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "      }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "    }"		| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "  }"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
+	@echo "]"			| tee -a ../i2p.newsxml/data/win/beta/releases.json
--- a/release.sh
+++ b/release.sh
@ -0,0 +1,7 @@
+#!/bin/bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "$SCRIPT_DIR" || exit 1
+
+./unsigned.sh
+./sign.sh
--- a/router.config
+++ b/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
--- a/sign.sh
+++ b/sign.sh
@ -0,0 +1,45 @@
+#!/bin/bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "$SCRIPT_DIR" || exit 1
+
+. i2pversion
+
+if [ -f i2pversion_override ]; then
+    . i2pversion_override
+fi
+
+. config.sh
+
+if [ -f config_overide.sh ]; then
+    . config_override.sh
+fi
+
+linuxsign() {
+    ## LINUX SIGNING IS EXPERIMENTAL AND SHOULD NOT BE USED IN DEFAULT STATE.
+    if [ ! -f jsign-4.1.jar ]; then
+        wget -O jsign-4.1.jar https://github.com/ebourg/jsign/releases/download/4.1/jsign-4.1.jar
+    fi
+    if [ ! -f "$HOME/signingkeys/signing-key.jks" ]; then
+        mkdir -p "$HOME/signingkeys/"
+        keytool -genkey -alias server-alias -keyalg RSA -keypass changeit \
+            -storepass changeit -keystore "$HOME/signingkeys/signing-key.jks"
+    fi
+    java -jar jsign-4.1.jar \
+        --keystore "$HOME/signingkeys/signing-key.jks" \
+        --storepass changeit \
+        --keypass changeit \
+        --tsaurl "http://timestamp.sectigo.com" \
+        --name "I2P-Browser-Installer" \
+        --alg "SHA-512" \
+        "$1"
+}
+
+if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
+    JAVA_HOME=`type -p java|xargs readlink -f|xargs dirname|xargs dirname`
+    linuxsign I2P-Profile-Installer-$I2P_VERSION.exe
+    cp "I2P-Profile-Installer-$I2P_VERSION.exe" "I2P-Profile-Installer-$I2P_VERSION-signed.exe"
+else
+    signtool.exe sign "I2P-Profile-Installer-$I2P_VERSION.exe"
+    cp "I2P-Profile-Installer-$I2P_VERSION.exe" "I2P-Profile-Installer-$I2P_VERSION-signed.exe"
+fi
--- a/src/app-profile/prefs.js
+++ b/src/app-profile/prefs.js
@ -60,3 +60,4 @@ 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);
--- a/src/app-profile/user.js
+++ b/src/app-profile/user.js
@ -1,19 +1,18 @@
-# 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");
@ -106,7 +105,7 @@ 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("browser.startup.homepage", "http://127.0.0.1:7657/home");

 // Privacy-harden and disable irrelevant features.
 user_pref("app.normandy.api_url", "");
@ -222,3 +221,4 @@ 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.display.use_system_colors", false);
--- a/src/app-profile/version.txt
+++ b/src/app-profile/version.txt
@ -1 +1 @@
-1.06.1
+1.8.0
--- a/src/nsis/i2pbrowser-installer.nsi
+++ b/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"

@ -17,8 +17,9 @@ UniCode true
 var FFINSTEXE
 var FFNONTORINSTEXE
 var I2PINSTEXE
+Var PARENTOPTIONS

-
+SetOverwrite on
 !define FFINSTEXE
 !define FFNONTORINSTEXE
 !define FFINSTEXE32 "$PROGRAMFILES32\Mozilla Firefox\"
@ -27,22 +28,25 @@ var I2PINSTEXE
 !define I2PINSTEXE
 !define I2PINSTEXE32 "$PROGRAMFILES32\i2p"
 !define I2PINSTEXE64 "$PROGRAMFILES64\i2p"
+!define I2PINSTEXE_USERMODE "$LOCALAPPDATA\i2p"
+

 !define RAM_NEEDED_FOR_64BIT 0x80000000

 InstallDir "$PROGRAMFILES64\${COMPANYNAME}\${APPNAME}"

 # rtf or txt file - remember if it is txt, it must be in the DOS text format (\r\n)
-LicenseData "licenses\LICENSE.index"
+LicenseData "licenses\LICENSE.txt"
 # This will be in the installer/uninstaller's title bar
 Name "${COMPANYNAME} - ${APPNAME}"
 Icon ui2pbrowser_icon.ico
 OutFile "I2P-Profile-Installer-${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONBUILD}.exe"

-RequestExecutionLevel admin
+RequestExecutionLevel user

 !include LogicLib.nsh
 !include x64.nsh
+!include FileFunc.nsh
 !define MUI_ICON ui2pbrowser_icon.ico
 !define MUI_FINISHPAGE
 !include "MUI2.nsh"
@ -125,7 +129,8 @@ RequestExecutionLevel admin

 PageEx license
    licensetext "${LICENSE_TITLE}"
-    licensedata "licenses\LICENSE.index"
+    licensedata "licenses\LICENSE.txt"
+    #PageCallbacks elevatorCallback
 PageExEnd
 PageEx directory
    dirtext "${FIREFOX_MESSAGE}"
@ -140,49 +145,55 @@ PageEx directory
 PageExEnd
 Page instfiles

-
 !include i2pbrowser-mozcompat.nsi

 Function .onInit
-    !insertmacro MUI_LANGDLL_DISPLAY
-    Call ShouldInstall64Bit
-    ${If} $0 == 1
-        ${If} ${FileExists} "${FFINSTEXE64}/firefox.exe"
-            StrCpy $FFINSTEXE "${FFINSTEXE64}"
-            StrCpy $FFNONTORINSTEXE "${FFINSTEXE64}"
-    ${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/"
-        ${EndIf}
-        ${If} ${FileExists} "$PROFILE/Desktop/Tor Browser/Browser/firefox.exe"
-            StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/"
-        ${EndIf}
-    ${Else}
-        ${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/"
-        ${EndIf}
-        ${If} ${FileExists} "$PROFILE/Desktop/Tor Browser/Browser/firefox.exe"
-            StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/"
-        ${EndIf}
-    ${EndIf}
    StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
+    UserInfo::GetAccountType
+    pop $0
+    ${If} $0 != "admin"
+        StrCpy $INSTDIR "$LOCALAPPDATA\${COMPANYNAME}\${APPNAME}"
+        StrCpy $I2PINSTEXE "${I2PINSTEXE_USERMODE}"
+    ${EndIf}
    ${If} ${FileExists} "${I2PINSTEXE32}\i2p.exe"
        StrCpy $I2PINSTEXE "${I2PINSTEXE32}"
    ${EndIf}
    ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
        StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
    ${EndIf}
+    !insertmacro MUI_LANGDLL_DISPLAY
+    Call ShouldInstall64Bit
+    ${If} $0 == 1
+        ${If} ${FileExists} "${FFINSTEXE64}\firefox.exe"
+            StrCpy $FFINSTEXE "${FFINSTEXE64}"
+            StrCpy $FFNONTORINSTEXE "${FFINSTEXE64}"
+    ${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\"
+        ${EndIf}
+        ${If} ${FileExists} "$PROFILE\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\Desktop\Tor Browser\Browser\"
+        ${EndIf}
+    ${Else}
+        ${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\"
+        ${EndIf}
+        ${If} ${FileExists} "$PROFILE\Desktop\Tor Browser\Browser\firefox.exe"
+            StrCpy $FFINSTEXE "$PROFILE\Desktop\Tor Browser\Browser\"
+        ${EndIf}
+    ${EndIf}
+    # look for user installs
 FunctionEnd

 Function firefoxDetect
-    ${If} ${FileExists} "$FFINSTEXE/firefox.exe"
+    ${If} ${FileExists} "$FFINSTEXE\firefox.exe"
        Abort directory
    ${EndIf}
 FunctionEnd
@ -194,39 +205,19 @@ 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}
 FunctionEnd

-# start default section
-Section Install
-
-    ${If} ${Silent}
+Function installerFunction
+${If} ${Silent}
        ${Do}
            ${FindProcess} "I2P.exe" $0
            Sleep 500
@ -251,18 +242,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 +251,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 +294,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 +314,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 +325,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"
@ -385,57 +339,54 @@ Section Install

    # create a shortcut to the uninstaller
    CreateShortCut "$SMPROGRAMS\${APPNAME}\Uninstall-${APPNAME}.lnk" "$INSTDIR\uninstall-i2pbrowser.exe"
+FunctionEnd

+Function elevatorCallback
+    ${GetOptions} $CMDLINE "/p" $PARENTOPTIONS
+    ${If} "${PARENTOPTIONS}" != ""
+        StrCpy $PARENTOPTIONS "-ArgumentList '$PARENTOPTIONS'"
+    ${EndIf}
+    ${If} ${FileExists} "${I2PINSTEXE64}\i2p.exe"
+        ExecShell open "powershell -Command Start-Process .\$EXEFILE -Wait -Verb RunAs $PARENTOPTIONS"
+        #Quit
+    ${ElseIf} ${FileExists} "${I2PINSTEXE32}\i2p.exe"
+        ExecShell open "powershell -Command Start-Process .\$EXEFILE -Wait -Verb RunAs $PARENTOPTIONS"
+        #Quit
+    ${EndIf}
+FunctionEnd
+
+
+# start default section
+Section Install
+    Call installerFunction
 SectionEnd

 # uninstaller section start
 Section "uninstall"
-
-    # Remove the licenses
-    rmDir /r "$INSTDIR\licenses"
-
    # Uninstall the launcher scripts
-    Delete $INSTDIR\i2pbrowser.bat
-    Delete $INSTDIR\i2pconfig.bat
-    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"
+    Delete $INSTDIR\*
+    rmDir /r "$INSTDIR\"
+    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
+        Delete $I2PINSTEXE\*
+        rmDir /r "$I2PINSTEXE"
+    ${EndIf}
+    

    # 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}"
-    rmDir "$INSTDIR\firefox.profile.i2p\extensions"
-    rmDir "$INSTDIR\firefox.profile.i2p"
-    rmDir "$LOCALAPPDATA\${APPNAME}"
-    rmDir "$INSTDIR"
+    rmDir /r "$SMPROGRAMS\${APPNAME}"
+    rmDir /r "$INSTDIR\firefox.profile.i2p\extensions"
+    rmDir /r "$INSTDIR\firefox.profile.i2p"
+    rmDir /r "$LOCALAPPDATA\${APPNAME}"
+    rmDir /r "$INSTDIR"
    
-    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
-        rmDir "$I2PINSTEXE"
-    ${EndIf}
    # delete the uninstaller
    Delete "$INSTDIR\uninstall-i2pbrowser.exe"

@ -452,9 +403,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
--- a/src/nsis/i2pbrowser-jpackage.nsi
+++ b/src/nsis/i2pbrowser-jpackage.nsi
@ -1 +1 @@
-!define I2P_VERSION 1.6.1
+!define I2P_VERSION 1.8.0
--- a/src/nsis/i2pbrowser-version.nsi
+++ b/src/nsis/i2pbrowser-version.nsi
@ -1,3 +1,3 @@
 !define VERSIONMAJOR 1
-!define VERSIONMINOR 06
-!define VERSIONBUILD 1
+!define VERSIONMINOR 8
+!define VERSIONBUILD 0
--- a/src/profile/prefs.js
+++ b/src/profile/prefs.js
@ -58,3 +58,5 @@ 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);
--- a/src/profile/user.js
+++ b/src/profile/user.js
@ -1,19 +1,18 @@
-# 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");
@ -83,6 +82,9 @@ user_pref("extensions.torbutton.use_nontor_proxy", true);
 //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);
@ -106,7 +108,7 @@ 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("browser.startup.homepage", "http://127.0.0.1:7657/home");

 // Privacy-harden and disable irrelevant features.
 user_pref("app.normandy.api_url", "");
@ -222,3 +224,5 @@ 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);
--- a/src/profile/version.txt
+++ b/src/profile/version.txt
@ -1 +1 @@
-1.06.1
+1.8.0
--- a/src/win/common.bat
+++ b/src/win/common.bat
@ -0,0 +1,19 @@
+@echo off
+
+SET MYPATH=%~dp0
+
+set ProgramFiles64=%ProgramFiles: (x86)=%
+set I2PData="%LocalAppData%\I2P\"
+
+set I2PPath="%ProgramFiles%\I2P\"
+if exist "%LocalAppData%\I2P\I2P.exe" (
+  set I2PPath="%LocalAppData%\I2P\"
+)
+
+if exist "%ProgramFiles64%\I2P\" (
+  set I2PPath="%ProgramFiles64%\I2P\"
+)
+
+if exist "%ProgramFiles(x86)%\I2P" (
+  set I2PPath="%ProgramFiles(x86)%\I2P\"
+)
--- a/src/win/copy-config-profile.bat
+++ b/src/win/copy-config-profile.bat
@ -0,0 +1,12 @@
+
+SET MYPATH=%~dp0
+call "%MYPATH%common.bat"
+
+if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\" (
+  echo "profile is configured" & xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.config.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\extensions"
+) else (
+  echo "configuring profile" & xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.config.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p"
+)
+
+xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.config.i2p\user.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\user.js*"
+xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.config.i2p\prefs.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p\prefs.js*"
--- a/src/win/copy-profile.bat
+++ b/src/win/copy-profile.bat
@ -0,0 +1,12 @@
+
+SET MYPATH=%~dp0
+call "%MYPATH%common.bat"
+
+if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (
+  echo "profile is configured, updating extensions" & xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\extensions"
+) else (
+  echo "configuring profile" & xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
+)
+
+xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.i2p\user.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\user.js*"
+xcopy /s /i /y "%I2PData%I2PBrowser-Launcher\firefox.profile.i2p\prefs.js" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\prefs.js*"
--- a/src/win/i2pbrowser-private.bat
+++ b/src/win/i2pbrowser-private.bat
@ -1,30 +1,14 @@
@echo on

-set "I2PPath=%ProgramFiles%\I2P\"
-if exist "%ProgramFiles%\I2P\" (
-  set "I2PPath=%ProgramFiles%\I2P\"
-)
+SET MYPATH=%~dp0
+call "%MYPATH%common.bat"

-if exist "%ProgramFiles(x86)%\I2P" (
-  set "I2PPath=%ProgramFiles(x86)%\I2P"
-)
+call "%MYPATH%launchi2p.bat"

-if exist "%ProgramFiles%\I2P\jpackaged" (
-  start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"
-) else (
-  start "i2p" "%I2PPath%\i2p.exe"
-)
+call "%MYPATH%copy-profile.bat"

 timeout /t 3

-if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (
-  echo "profile is configured, updating 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 "%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
-)
-
 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.i2p" -private-window about:blank
  exit
--- a/src/win/i2pbrowser.bat
+++ b/src/win/i2pbrowser.bat
@ -1,30 +1,14 @@
@echo on

-set "I2PPath=%ProgramFiles%\I2P\"
-if exist "%ProgramFiles%\I2P\" (
-  set "I2PPath=%ProgramFiles%\I2P\"
-)
+SET MYPATH=%~dp0
+call "%MYPATH%common.bat"

-if exist "%ProgramFiles(x86)%\I2P" (
-  set "I2PPath=%ProgramFiles(x86)%\I2P"
-)
+call "%MYPATH%launchi2p.bat"

-if exist "%ProgramFiles%\I2P\jpackaged" (
-  start "i2p" /D "%LOCALAPPDATA%\I2P" "%I2PPath%\i2p.exe"
-) else (
-  start "i2p" "%I2PPath%\i2p.exe"
-)
+call "%MYPATH%copy-profile.bat"

 timeout /t 3

-if exist "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p\" (
-  echo "profile is configured, updating 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 "%ProgramFiles%\I2P\I2PBrowser-Launcher\firefox.profile.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.i2p"
-)
-
 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.i2p" -url %1
  exit
--- a/src/win/i2pconfig.bat
+++ b/src/win/i2pconfig.bat
@ -1,13 +1,23 @@
@echo off

-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"
-) else (
-  echo "configuring profile"
-  xcopy /s /i /y "$INSTDIR\firefox.profile.config.i2p" "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p"
+SET MYPATH=%~dp0
+call "%MYPATH%common.bat"
+
+call "%MYPATH%copy-config-profile.bat"
+
+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
 )

-start "i2pconfig" "c:\Program Files\Mozilla Firefox\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\I2PBrowser-Launcher\firefox.profile.config.i2p" -url %1
+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
--- a/src/win/launchi2p.bat
+++ b/src/win/launchi2p.bat
@ -0,0 +1,17 @@
+@echo on
+
+SET MYPATH=%~dp0
+call "%MYPATH%common.bat"
+
+
+echo "check if I2P is already running"
+::only launch I2P if the proxy is not up on 4444
+netstat /o /a /n | findstr "LISTENING" | findstr "7657" >nul 2>nul && (
+  echo "I2P is already running, not launching"
+) || (
+  echo "I2P is not running, launching"
+  echo start "i2p" /D %I2PPath% i2p.exe
+  start "i2p" /D %I2PPath% i2p.exe
+)
+
+
--- a/src/win/test.bat
+++ b/src/win/test.bat
@ -0,0 +1,8 @@
+
+SET MYPATH=%~dp0
+
+call "%MYPATH%common.bat"
+
+set TEST=TEST
+
+echo testing: %TEST% path to me: %MYPATH% path to I2P %I2PPath%
--- a/unsigned.sh
+++ b/unsigned.sh
@ -0,0 +1,11 @@
+#!/bin/bash
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+cd "$SCRIPT_DIR" || exit 1
+
+./clean.sh
+wsl make distclean
+wsl make clean-extensions
+wsl make extensions
+./build.sh
+wsl make
Author	SHA1	Message	Date
idk	c7bea957cb	eliminate extra quote from launchi2p.bat	2022-06-06 00:23:47 -04:00
idk	e246159285	update router version	2022-05-23 16:48:11 -04:00
idk	a7c5151b56	make i2pIsRunning behavior consistent for both tests	2022-05-20 18:46:34 -04:00
idk	23ae110698	move i2pIsRunning further up in launcher	2022-05-20 18:44:39 -04:00
idk	46ef089acc	check for router.ping to determine if there's another I2P running	2022-05-20 18:42:35 -04:00
idk	235b6444e7	check for 7657 instead of 4444 in launcher script	2022-05-20 18:21:49 -04:00
idk	d5b1291a30	\licenses\license\	2022-05-20 13:11:45 -04:00
idk	f7fa344ea8	\is\are"	2022-05-20 13:02:30 -04:00
idk	698befcdda	fix columns in license.index	2022-05-20 13:00:07 -04:00
idk	c9747734dc	document license generation/display	2022-05-20 12:56:59 -04:00
idk	b4261675b0	change license generation/display	2022-05-20 12:53:42 -04:00
idk	b2b3ba75fb	don't pull tags or checkout version since we're checking out the tags in one step	2022-05-19 20:42:03 -04:00
idk	8257ee6625	always change back to the source directory when running a new script	2022-05-19 19:50:31 -04:00
idk	e23db67782	fix mode of unsigned.sh	2022-05-19 19:36:57 -04:00
idk	ff733907c0	re-upload if we re-run daily	2022-05-18 22:51:32 -04:00
idk	a09da35170	re-upload if we re-run daily	2022-05-18 22:30:29 -04:00
idk	af5add3143	fix jpackage version in nsis installer	2022-05-18 21:32:42 -04:00
idk	0f5eb563eb	make jpackage	2022-05-18 21:30:45 -04:00
idk	53dd311b58	clean before running daily.sh	2022-05-18 21:28:02 -04:00
idk	6fc7d9a7b4	clean before running daily.sh	2022-05-18 21:26:33 -04:00
idk	d283efdbf5	fix missing .sh on instructions in daily.sh	2022-05-18 21:25:27 -04:00
idk	de56966a51	fix date	2022-05-18 21:19:58 -04:00
idk	9b7f886e96	re-add nsi file	2022-05-18 21:17:26 -04:00
idk	ec94eee4e2	experiment with daily uploads	2022-05-18 21:16:27 -04:00
idk	17d3b9161f	experiment with daily uploads	2022-05-18 21:11:11 -04:00
idk	b8d1a48961	experiment with daily uploads	2022-05-18 20:50:38 -04:00
idk	597207b425	experiment with daily uploads	2022-05-18 20:50:06 -04:00
idk	d851dec3c4	experiment with daily uploads	2022-05-18 19:48:42 -04:00
idk	1339df4ea6	conditionally include .version	2022-05-18 18:26:46 -04:00
idk	02ed695417	i2pversion or i2pversion_overrides automatically sets version no matter what	2022-05-18 18:19:06 -04:00
idk	0c0219c308	i2pversion or i2pversion_overrides automatically sets version no matter what	2022-05-18 18:17:26 -04:00
idk	d47a6c1234	fix unchecked-in copy change	2022-05-18 18:12:41 -04:00
idk	cc5f3052fa	fix launch message	2022-05-18 18:07:52 -04:00
idk	c10cf6aaeb	use netstat oan and findstr in router up check because it's magnitudes faster	2022-05-18 18:06:12 -04:00
idk	17f2c8bdae	actually, do set the working directory to the exe path because it achieves the identical result and matches the i2p.i2p desktop shortcut behavior	2022-05-18 17:50:32 -04:00
idk	7627dd9742	Don't set working directory in start command so it can just have one	2022-05-18 17:44:53 -04:00
idk	d4f14fdae9	Don't set working directory in start command so it can just have one	2022-05-18 17:43:16 -04:00
idk	1e18aa8c0d	Apparently that is how you suppress the copy-as-file notification from xcopy.	2022-05-18 17:16:25 -04:00
idk	88ba9dc96e	more batch quoting madness	2022-05-18 17:09:10 -04:00
idk	3fda252a34	more batch quoting madness	2022-05-18 17:06:56 -04:00
idk	dbc8376ebd	more batch quoting madness	2022-05-18 16:55:29 -04:00
idk	ed53efea8f	more batch quoting madness	2022-05-18 16:51:21 -04:00
idk	a4d9d17306	more batch quoting madness	2022-05-18 16:48:57 -04:00
idk	42b2e78bbe	don't echo in common.bat	2022-05-18 16:35:22 -04:00
idk	7fb9fd4e8d	Cleanup quoting in common.bat	2022-05-18 16:28:39 -04:00
idk	6ca76277db	Execute if statement outcomes on one line because batch.	2022-05-18 16:18:43 -04:00
idk	983813caaf	Execute if statement outcomes on one line because batch.	2022-05-18 16:14:03 -04:00
idk	5d9cd3b669	Execute if statement outcomes on one line because batch.	2022-05-18 16:12:09 -04:00
idk	45a358bba4	Execute if statement outcomes on one line because batch.	2022-05-18 16:09:13 -04:00
idk	1b2985665a	Execute if statement outcomes on one line because batch.	2022-05-18 15:59:04 -04:00
idk	a40a212774	Always get profile from data directory	2022-05-18 15:14:15 -04:00
idk	78e703fd92	enclose conditionals in copy-profile scripts to allow multi-line statements within them? Batch is weird	2022-05-18 15:10:49 -04:00
idk	7f2ef1d074	quote call statements in launcher scripts	2022-05-18 14:44:19 -04:00
idk	c2b2624388	delete wrapper script, won't need it	2022-05-18 14:26:01 -04:00
idk	c5dda34ef2	delete wrapper script, won't need it	2022-05-18 14:25:34 -04:00
idk	8c507478b6	delete wrapper script, won't need it	2022-05-18 14:16:41 -04:00
idk	574321a1ee	fix path detection when NSIS overrides Windows Environment Variables	2022-05-18 14:06:05 -04:00
idk	28ad8fcb61	disable elevator callback	2022-05-18 13:43:47 -04:00
idk	af3e1696b8	detect admin installs even when installing in adminless mode	2022-05-18 12:35:55 -04:00
idk	ca4bf67e19	no one: NSIS: a dozen different ways to store or reference a value, none of which have consistent behavior or semantics.	2022-05-18 12:05:18 -04:00
idk	451e5d0494	use a callback to elevate earlier in the process	2022-05-18 11:46:06 -04:00
idk	ea8788e1c8	Don't pass an ArgumentList unless an ArgumentList exists	2022-05-18 11:30:48 -04:00
idk	fa05c5f1cc	More powershell elevator refinements	2022-05-18 11:13:28 -04:00
idk	3ab6464c54	Add script to build unsigned exes automatically before releases	2022-05-18 01:08:44 -04:00
idk	0d29cd2bff	Simplify runas commands	2022-05-18 01:06:24 -04:00
idk	cf4017f212	Elevator has to use powershell	2022-05-17 18:31:44 -04:00
idk	10ca0ec281	Update exe signing procedure	2022-05-17 18:02:03 -04:00
idk	288007d6dd	Update exe signing procedure	2022-05-17 17:49:33 -04:00
idk	0e7b25ad2c	Update release procedure	2022-05-17 17:27:06 -04:00
idk	27082b713e	Update exe signing procedure	2022-05-17 17:26:04 -04:00
idk	e16c7bca76	Update su3 signing procedure	2022-05-17 17:25:31 -04:00
idk	85fb43ca57	Update su3 signing procedure	2022-05-17 17:20:15 -04:00
idk	7a3598817d	Update su3 signing procedure	2022-05-17 17:18:12 -04:00
idk	8e95435be0	fix missing variable	2022-05-17 17:12:26 -04:00
idk	9aba119a49	Also attempt to do it without the wrapper	2022-05-17 16:52:22 -04:00
idk	cf091c9e10	Don't launch I2P if it's already running	2022-05-17 16:43:41 -04:00
idk	1cbd3f6553	specify user:administrator to runas	2022-05-17 16:38:18 -04:00
idk	467512bd26	update version	2022-05-17 16:14:39 -04:00
idk	af9c2460e9	use jsign	2022-05-17 16:12:43 -04:00
idk	6ffd0dae9a	bump the version, use an updated JNA_VERSION	2022-05-17 15:12:39 -04:00
idk	fb28051ba2	Minify phases of wrapper launcher	2022-05-17 14:30:23 -04:00
idk	8f19517167	Minify phases of wrapper launcher	2022-05-17 14:23:49 -04:00
idk	e55c57c6f8	add a wrapper to launch installer as correct user	2022-05-17 13:56:45 -04:00
idk	e722cb4bec	add a wrapper to launch installer as correct user	2022-05-17 13:51:03 -04:00
idk	963d7e88b4	update examples in config.sh	2022-05-10 20:12:23 -04:00
idk	59baf37322	don't clean in build.sh	2022-05-10 19:26:06 -04:00
idk	b949fa8a84	show path and java home in build process	2022-05-10 19:14:05 -04:00
idk	12b762d595	set path and java home in config.sh	2022-05-10 19:12:25 -04:00
idk	aa2ab5bbe5	try adding ALL-UNNAMED to properties	2022-05-10 18:25:10 -04:00
idk	e3f42a42bd	log launcher into a file before router starts, launcher.log. Get rid of system.out logging.	2022-05-10 18:11:45 -04:00
idk	3da8f56247	log launcher into a file before router starts, launcher.log. Get rid of system.out logging.	2022-05-10 18:00:21 -04:00
idk	31c60f74e1	log launcher into a file before router starts, launcher.log. Get rid of system.out logging.	2022-05-10 17:49:40 -04:00
idk	cd790ecae8	bump version	2022-05-08 22:31:34 -04:00
idk	cfbeae0ecb	fix config file copy which was cleared by build	2022-05-08 22:27:33 -04:00
idk	b87e701ee0	fix config file copy which was cleared by build	2022-05-08 22:12:28 -04:00
idk	f8c84ba50a	add some crude logging and a signtool example to the readme.	2022-05-08 20:24:33 -04:00
idk	5d3615a0c6	Update changelog	2022-05-08 19:39:44 -04:00
idk	ec98865d33	call common.bat on every script that requires variables set in that script	2022-05-08 13:06:18 -04:00
idk	978af1cb11	move more scripted prerequisites to separate files	2022-05-08 13:02:59 -04:00
idk	560f1c707a	update version, get rid of profile version	2022-05-05 18:20:54 -04:00
idk	e29fdd95a1	run make clean in clean.sh	2022-05-05 18:18:20 -04:00
idk	39e1df1b10	update the changelog	2022-05-05 18:14:08 -04:00
idk	93b6bc4b3e	bump version for a release, pull tags during build	2022-05-05 18:09:35 -04:00
idk	334e6525b1	bump version	2022-05-05 18:02:36 -04:00
idk	46c6fb77e2	Devise a way to test I2P router detection priorities more easily #17	2022-05-05 17:01:01 -04:00
idk	9305301bf5	Fix I2P router detection priorities in Windows launcher scripts #17	2022-05-05 16:21:20 -04:00
idk	d874204add	Merge branch 'master' of i2pgit.org:i2p-hackers/i2p.firefox	2022-04-20 17:12:25 -04:00
idk	aadf287ecd	Document how to switch JVM's in config file	2022-04-20 17:06:20 -04:00
idk	66864c317d	Merge branch 'settable-paths' into 'master' Enable updating to/from non `%ProgramFiles%` locations Closes #13 See merge request i2p-hackers/i2p.firefox!6	2022-04-20 20:22:26 +00:00
idk	ae02a1c6db	Document how to switch JVM's in config file	2022-04-20 16:17:58 -04:00
idk	b711a36c1d	Document how to switch JVM's in config file	2022-04-20 16:11:05 -04:00
idk	115805b9fb	Make config.sh point to 17.0.3	2022-04-20 15:53:00 -04:00
idk	c426b73d79	Merge branch 'master' into 'settable-paths' # Conflicts: # src/nsis/i2pbrowser-version.nsi	2022-04-20 18:54:51 +00:00
idk	a20b8ff46d	Affix version	2022-04-20 14:51:58 -04:00
idk	c14287048f	add a config.sh file to configure JVM/JDK at build time	2022-04-20 14:09:40 -04:00
idk	9be28a53fd	add GPL+Classpath license and EPL license to bundle	2022-04-20 11:05:27 -04:00
idk	14fdca2e1d	update to i2p-jpackage-1.7.1	2022-04-20 09:05:19 -04:00
idk	e74405073a	update to i2p-jpackage-1.7.1	2022-04-20 09:03:00 -04:00
idk	a05f3777a7	Merge branch 'master' into 'settable-paths' # Conflicts: # src/nsis/i2pbrowser-version.nsi	2022-04-08 14:29:34 +00:00
idk	e051d4095c	add use_system_colors to the prefs.js and user.js files	2022-04-07 20:34:51 -04:00
idk	73f94a120e	Merge branch 'master' into 'settable-paths' # Conflicts: # src/nsis/i2pbrowser-version.nsi # src/win/i2pbrowser-private.bat # src/win/i2pbrowser.bat	2022-04-04 17:55:42 +00:00
idk	74d5ccc47f	cd before starting a jpackaged router from the script in case the environment is overriding it	2022-03-25 18:51:11 -04:00
idk	4ce272765f	check if the console is up before continuing	2022-03-25 18:47:48 -04:00
idk	714ef026f3	always copy settings to profile directory	2022-03-25 17:49:39 -04:00
idk	8135506213	update config launcher script	2022-03-25 17:23:49 -04:00
idk	ffb9efaab8	update browser profiles	2022-03-25 17:09:07 -04:00
idk	706a7a6fe2	enable a user-mode run of I2P jpackages	2022-03-25 15:23:19 -04:00
idk	af44dd357a	enable a user-mode install of I2P jpackages	2022-03-25 15:09:15 -04:00
idk	c64f0fe632	enable a user-mode install of I2P jpackages	2022-03-25 15:04:15 -04:00
idk	cf3385cfd0	Set install dir to local app data if the user is not elevated	2022-03-25 14:50:11 -04:00
idk	ef0b5c5cad	Set install dir to local app data if the user is not elevated	2022-03-25 14:32:05 -04:00
idk	9282d22e7b	Request only the user execution level, highest will request admin if the user has permission to elevate and I want to avoid that	2022-03-25 14:23:50 -04:00
idk	400b9d3edc	Set install dir to local app data if the user is not elevated	2022-03-25 14:20:39 -04:00
idk	4aa673a959	Request only the user execution level, highest will request admin if the user has permission to elevate and I want to avoid that	2022-03-25 14:19:06 -04:00
idk	1f543c8db5	Request only the highest execution level, not necessarily admin	2022-03-25 13:31:57 -04:00
idk	87f9cc063b	update version number	2022-03-25 12:22:46 -04:00
idk	6651a16fb2	don't accidentally dupe values in router.config when running src/I2P/config target twice	2022-03-25 12:17:28 -04:00
idk	9a34008c48	Makefile wasn't producing licenses at the right step, try and detect if elevated from the NSIS installer from the start of the script, for now, fail if we aren't	2022-03-25 12:05:57 -04:00
idk	1f980fb016	Add choco to the Windows README	2022-03-21 11:43:34 -04:00
idk	cf394be352	Add choco to the Windows README	2022-03-21 11:41:29 -04:00
idk	51dca79a76	remove the RequestExecutionLevel line	2022-03-21 11:36:28 -04:00
idk	bb7dcaa907	Add elevator.java to build.sh	2022-03-21 11:32:10 -04:00
idk	9da43b3961	Try a way of determining required rights for the installer	2022-03-21 11:04:27 -04:00
idk	a28bb6ac3c	Fix package imports, copy over the elevator functions	2022-03-20 02:41:09 -04:00
idk	44b2ae44ee	Don't download JNA jars if they're already downloaded	2022-03-19 18:10:36 -04:00
idk	e2ad0d190a	Use both JNA jars	2022-03-19 17:52:01 -04:00
idk	f5a424f083	Fix wrong JNA version	2022-03-19 17:23:55 -04:00
idk	fe99c7bb05	Check in Shell32X.java and see if it builds on a real Windows machine?	2022-03-19 16:39:06 -04:00
idk	bc36564f5d	Start adding JNA stuff, for now just copied from zlatinb's but I'll need to customize a bit to account for portables	2022-03-19 13:44:29 -04:00
idk	d8e7551edb	update the version	2022-03-11 14:52:07 -05:00
idk	b8b7a1d21c	bump number to build	2022-02-24 00:28:32 -05:00
idk	99ef12af4b	Use the shortcuts to launch the link, fix ShellExecAsUser based on some testing	2022-02-23 17:00:56 -05:00
idk	b24caf119c	do a quick check of 7657 before running the router from the bat script. It won't run a second router in any case, but it's probably better to skip it if we know a router is already there.	2022-02-23 13:49:21 -05:00
idk	e50fae0dff	Add Ubuntu, WSL to NSIS plugin section	2022-02-23 13:42:24 -05:00
idk	2776609179	Add information about how to install ShellExecAsUser NSIS plugin	2022-02-23 12:41:49 -05:00
idk	91728cd98c	bump version for pull on Windows build machine	2022-02-23 01:17:26 -05:00
idk	7172b051aa	bump version for pull on Windows build machine	2022-02-23 00:58:55 -05:00
idk	3391c23abd	Null check path_override	2022-02-20 20:29:47 -05:00
idk	723b4d0e27	Switch I2P and I2P_CONFIG for environment variable based install-path configuration	2022-02-19 11:13:27 -05:00
idk	09d07c8c88	Merge branch 'master' of 127.0.0.1:i2p-hackers/i2p.firefox into settable-paths	2022-02-18 01:52:47 -05:00
idk	2afeee3d56	make build.sh forcibly change to i2p.firefox directory before running, it won't work from anywhere else	2022-02-17 16:31:14 -05:00
idk	1d0cf4aba7	make the path that the install and config are placed in configurable	2022-02-17 16:02:13 -05:00
idk	cedacc64ce	pull the whole addon URL from the AMO API	2022-02-11 21:17:06 -05:00
idk	cef159a137	fix build-extensions target	2022-02-11 20:51:12 -05:00
idk	f910ec2dde	Get rid of WindowsUpdatePostProcessor() constructor with no arguments, since this will lead to a null context which will break everything and is not useful/used anyway	2022-02-11 14:42:37 -05:00
idk	36b0618b8d	Loop on the CAM until the CAM is non-null to prevent a situation where the null CAM is used to call getRegisteredApp, apparenly due to a race condition somewhere	2022-02-11 13:10:50 -05:00
idk	8200d65eb5	Don't use a static global UPP	2022-02-11 01:34:58 -05:00
idk	565ac41168	re-apply I2P_VERSION, fix new-extensions target	2022-02-10 23:26:22 -05:00
idk	bee6a1b2a8	start writing my changelog	2022-02-10 20:24:37 -05:00
idk	c7be165fb4	start writing my changelog	2022-02-10 20:24:05 -05:00
idk	1f0cb37588	fix make targets for experimental extension loadout	2022-02-10 19:38:52 -05:00
idk	1c4761f3b2	drastically simplify NSIS builds	2022-02-10 19:24:15 -05:00
idk	77c7aede79	Install directory construction should take place inside of build/	2022-02-09 23:02:33 -05:00
idk	f58944b21a	remove url files on make clean target	2022-02-09 21:45:12 -05:00
idk	56a83972e4	Split the Makefile up into a bunch of categorized sub-files.	2022-02-09 21:43:30 -05:00
idk	34197f013d	Add a testing-releases.json target.	2022-02-09 17:22:34 -05:00
idk	ec68e623b3	add unsigned target	2022-02-09 17:19:15 -05:00
idk	5f8dcd5f27	Add a testing-releases.json target.	2022-02-09 17:13:33 -05:00
idk	a152a14655	s/_/-/g, gitignore fixes	2022-02-09 14:06:05 -05:00
idk	8121d08a7c	More windows launcher fine-tuning	2022-02-06 16:55:43 -05:00
idk	0da515eedf	apply patch brought over from Windows machine, fixes some build issues	2022-02-06 00:36:55 -05:00
idk	dc219e6287	Make sure the gitignore is right	2022-02-05 15:04:25 -05:00
idk	e7cee0bcf1	Enable fission.autostart and gfx.webrender.all by default. Allow users to electively enable canvas.	2022-02-05 11:19:11 -05:00
idk	ab8424c767	Enable fission.autostart and gfx.webrender.all by default. Allow users to electively enable canvas.	2022-02-05 11:15:51 -05:00
idk	3f89a73856	git clean src a nd build directories when running the make clean targets, including ignored files. make i2pbrowser_jpackage target always run regardless of whether it ran before.	2022-02-05 10:53:27 -05:00
idk	7a79341e69	Switch myself to the primary news provider and switch the primary news provider to me	2022-02-04 13:37:51 -05:00
 @ -1 +1 @@
 .06.1
 .8.0