add make target

backport the different languages issue fix from EXPERIMENTAL-jpackage

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

.gitignore

@@ -1,3 +1,7 @@
 build
 *.deb
-*.tgz
+*.tgz
+I2P-Profile-Installer-0.03.exe
+I2P/
+router.info
+router.keys.dat

HTTPSEverywhere.url

@@ -1 +1 @@
-https://addons.mozilla.org/firefox/downloads/file/3716461/2021.1.27/https_everywhere-2021.1.27-an+fx.xpi
+https://addons.mozilla.org/firefox/downloads/file/3716461/2021.4.15/https_everywhere-2021.4.15-an+fx.xpi

Makefile

@@ -1,11 +1,38 @@
-all: profile.tgz app-profile.tgz install.exe
+all: install.exe
 
-install.exe: profile build/licenses
+prep: profile.tgz app-profile.tgz profile build/licenses build/I2P build/I2P/config
 	cp src/nsis/*.nsi build
 	cp src/nsis/*.nsh build
 	cp src/icons/*.ico build
+
+install.exe: prep
 	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"
+
+build/I2P: build
+	rm -rf build/I2P
+	cp -rv I2P build/I2P ; true
+
+configdir: src/I2P/config
+
+src/I2P/config:
+	rm -rf src/I2P/config/geoip src/I2P/config/webapps src/I2P/config/certificates
+	echo true | tee src/I2P/config/jpackaged ; true
+	cp $(RES_DIR)/clients.config src/I2P/config/ ; true
+	cp $(RES_DIR)/i2ptunnel.config src/I2P/config/ ; true
+	cp $(RES_DIR)/wrapper.config src/I2P/config/ ; true
+	cp $(RES_DIR)/hosts.txt src/I2P/config/hosts.txt ; true
+	cp -R $(RES_DIR)/certificates src/I2P/config/certificates ; true
+	mkdir -p src/I2P/config/geoip ; true
+	cp $(RES_DIR)/GeoLite2-Country.mmdb.gz src/I2P/config/geoip/GeoLite2-Country.mmdb.gz ; true
+	cp -R "$(PKG_DIR)"/webapps src/I2P/config/webapps ; true
+	cd src/I2P/config/geoip && gunzip GeoLite2-Country.mmdb.gz; cd ../../.. ; true
+
+build/I2P/config: build/I2P
+	cp -rv src/I2P/config build/I2P/config ; true
+
 #
 # Warning: a displayed license file of more than 28752 bytes
 # will cause makensis V3.03 to crash.
@@ -14,7 +41,7 @@ install.exe: profile build/licenses
 build/licenses: build
 	mkdir -p build/licenses
 	cp license/* build/licenses
-	cp LICENSE build/licenses/MIT.txt
+	cp LICENSE.md build/licenses/MIT.txt
 	unix2dos build/licenses/LICENSE.index
 
 clean:
@@ -44,10 +71,10 @@ build/profile/bookmarks.html: build/profile src/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/NoScript.xpi build/HTTPSEverywhere.xpi build/i2ppb@eyedeekay.github.io.xpi build/profile/extensions
+copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2prhz@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
+	cp build/i2prhz@eyedeekay.github.io.xpi build/profile/extensions/i2prhz@eyedeekay.github.io.xpi
 
 app-profile: 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
 
@@ -72,18 +99,18 @@ build/app-profile/bookmarks.html: build/app-profile src/app-profile/bookmarks.ht
 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
+copy-app-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/i2prhz@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
+	cp build/i2prhz@eyedeekay.github.io.xpi build/app-profile/extensions/i2prhz@eyedeekay.github.io.xpi
 
-build/i2ppb@eyedeekay.github.io.xpi:
-	curl -L `cat i2psetproxy.url` > build/i2ppb@eyedeekay.github.io.xpi
+build/i2prhz@eyedeekay.github.io.xpi:
+	curl -L `cat i2psetproxy.url` > build/i2prhz@eyedeekay.github.io.xpi
 
 build/NoScript.xpi: NoScript.url
-	curl `cat NoScript.url` > build/NoScript.xpi
+	curl -L `cat NoScript.url` > build/NoScript.xpi
 
 build/HTTPSEverywhere.xpi : HTTPSEverywhere.url
-	curl `cat HTTPSEverywhere.url` > build/HTTPSEverywhere.xpi
+	curl -L `cat HTTPSEverywhere.url` > build/HTTPSEverywhere.xpi
 
 clean-extensions:
 	rm -fv i2psetproxy.url NoScript.url HTTPSEverywhere.url
@@ -97,7 +124,7 @@ 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/3674169/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url
+	@echo "https://addons.mozilla.org/firefox/downloads/file/3784917/"`./amo-version.sh i2pipb-rhizome-variant`"/i2prhz@eyedeekay.github.io" > i2psetproxy.url
 
 build/profile/extensions: build/profile
 	mkdir -p build/profile/extensions
@@ -158,3 +185,22 @@ checkinstall:
 		--deldoc=yes \
 		--deldesc=yes \
 		--backup=no
+
+plugin.su3:
+	mkdir -p build/plugin
+	cp -v build/profile build/plugin/profile -r
+	i2p.plugin.native -name=firefox \
+		-signer=hankhill19580@gmail.com \
+		-version="1.05.1" \
+		-author=hankhill19580@gmail.com \
+		-autostart=false \
+		-clientname=firefox \
+		-consolename="I2P Browser" \
+		-name="i2pbrowser" \
+		-delaystart="1" \
+		-desc="`cat desc`" \
+		-exename=firefox \
+		-icondata=icon/icon.png \
+		-command="firefox --profile \$$PLUGIN\profile " \
+		-license=MIT \
+		-res=build/plugin

NoScript.url

@@ -1 +1 @@
-https://addons.mozilla.org/firefox/downloads/file/3534184/11.2.3/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi
+https://addons.mozilla.org/firefox/downloads/file/3534184/11.2.8/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi

i2psetproxy.url

@@ -1 +1 @@
-https://addons.mozilla.org/firefox/downloads/file/3674169/0.98/i2ppb@eyedeekay.github.io.xpi
+https://addons.mozilla.org/firefox/downloads/file/3784917/0.108/i2prhz@eyedeekay.github.io

src/app-profile/version.txt

@@ -1 +1 @@
-0.3
+0.4

src/nsis/i2pbrowser-installer.nsi

@@ -1,5 +1,5 @@
 # uncomment on v3
-# UniCode true
+UniCode true
 
 !define APPNAME "I2PBrowser-Launcher"
 !define COMPANYNAME "I2P"
@@ -169,10 +169,10 @@ Function .onInit
             StrCpy $FFINSTEXE "$PROFILE/Desktop/Tor Browser/Browser/"
         ${EndIf}
     ${EndIf}
-    ${If} ${FileExists} "${I2PINSTEXE32}"
+    ${If} ${FileExists} "${I2PINSTEXE32}/i2p.exe"
         StrCpy $I2PINSTEXE "${I2PINSTEXE32}"
     ${EndIf}
-    ${If} ${FileExists} "${I2PINSTEXE64}"
+    ${If} ${FileExists} "${I2PINSTEXE64}/i2p.exe"
         StrCpy $I2PINSTEXE "${I2PINSTEXE64}"
     ${EndIf}
 FunctionEnd
@@ -204,12 +204,24 @@ Section Install
     FileWrite $0 "@echo off"
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
-    FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
+    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
+        FileWrite $0 'start /D "%LOCALAPPDATA%\${APPNAME}" "" "$I2PINSTEXE\i2p.exe"'
+    ${Else}
+        FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
+    ${EndIf}
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
+    FileWrite $0 'if exist "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p\" ('
+    FileWrite $0 '  echo "profile is configured"'
+    FileWrite $0 ') else ('
+    FileWrite $0 '  echo "configuring profile"'
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
-    FileWrite $0 'start "" "$FFINSTEXE\firefox.exe" -no-remote -profile "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p" -url %1'
+    FileWrite $0 '  xcopy /s /i /y "$INSTDIR\firefox.profile.i2p" "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p"'
+    FileWrite $0 ')'
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
+    FileWrite $0 'start "" "$FFINSTEXE\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p" -url %1'
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
     FileWrite $0 exit
@@ -221,12 +233,24 @@ Section Install
     FileWrite $0 "@echo off"
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
-    FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
+    ${If} ${FileExists} "$I2PINSTEXE\jpackaged"
+        FileWrite $0 'start /D "%LOCALAPPDATA%\${APPNAME}" "" "$I2PINSTEXE\i2p.exe"'
+    ${Else}
+        FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
+    ${EndIf}
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
+    FileWrite $0 'if exist "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p\" ('
+    FileWrite $0 '  echo "profile is configured"'
+    FileWrite $0 ') else ('
+    FileWrite $0 '  echo "configuring profile"'
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
-    FileWrite $0 'start "" "$FFINSTEXE\firefox.exe" -no-remote -profile "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p" -private-window about:blank'
+    FileWrite $0 '  xcopy /s /i /y "$INSTDIR\firefox.profile.i2p" "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p"'
+    FileWrite $0 ')'
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
+    FileWrite $0 'start "" "$FFINSTEXE\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p" -private-window about:blank'
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
     FileWrite $0 exit
@@ -242,12 +266,17 @@ Section Install
     FileWrite $0 "@echo off"
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
-    FileWrite $0 'start "" "$I2PINSTEXE\i2p.exe"'
+    FileWrite $0 'if exist "%LOCALAPPDATA%\${APPNAME}\firefox.profile.config.i2p\" ('
+    FileWrite $0 '  echo "profile is configured"'
+    FileWrite $0 ') else ('
+    FileWrite $0 '  echo "configuring profile"'
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
+    FileWrite $0 '  xcopy /s /i /y "$INSTDIR\firefox.profile.config.i2p" "%LOCALAPPDATA%\${APPNAME}\firefox.profile.config.i2p"'
+    FileWrite $0 ')'
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
-    FileWrite $0 'start "" "$FFNONTORINSTEXE\firefox.exe" -no-remote -profile "$LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p" -url %1'
+    FileWrite $0 'start "" "$FFNONTORINSTEXE\firefox.exe" -no-remote -profile "%LOCALAPPDATA%\${APPNAME}\firefox.profile.config.i2p" -url %1'
     FileWriteByte $0 "13"
     FileWriteByte $0 "10"
     FileWrite $0 exit
@@ -255,46 +284,44 @@ Section Install
     FileWriteByte $0 "10"
     FileClose $0
 
-
-
     # Install the licenses
     createDirectory "$INSTDIR\licenses"
     SetOutPath "$INSTDIR\licenses"
     File /r licenses\*.*
 
     # Install the profile
-    createDirectory "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p"
-    SetOutPath "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p"
-    File profile/user.js
-    File profile/prefs.js
-    File profile/bookmarks.html
-    File profile/storage-sync.sqlite
+    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 "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p\extensions"
-    SetOutPath "$LOCALAPPDATA\${APPNAME}\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
+    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\i2prhz@eyedeekay.github.io.xpi
 
     # Install the config profile
-    createDirectory "$LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p"
-    SetOutPath "$LOCALAPPDATA\${APPNAME}\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
+    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 "$LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p\extensions"
-    SetOutPath "$LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p\extensions"
-    File profile/extensions/https-everywhere-eff@eff.org.xpi
-    File profile/extensions/i2ppb@eyedeekay.github.io.xpi
+    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\i2prhz@eyedeekay.github.io.xpi
 
     # Install the config userChrome
-    createDirectory "$LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p\chrome"
-    SetOutPath "$LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p\chrome"
-    File app-profile/chrome/userChrome.css
+    createDirectory "$INSTDIR\firefox.profile.config.i2p\chrome"
+    SetOutPath "$INSTDIR\firefox.profile.config.i2p\chrome"
+    File app-profile\chrome\userChrome.css
 
     SetOutPath "$INSTDIR"
     createDirectory "$SMPROGRAMS\${APPNAME}"
@@ -303,21 +330,32 @@ Section Install
     CreateShortCut "$DESKTOP\${APPNAME}.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pbrowser.bat$\" ${CONSOLE_URL}" "$INSTDIR\ui2pbrowser_icon.ico"
     CreateShortCut "$DESKTOP\Private Browsing-${APPNAME}.lnk" "C:\Windows\system32\cmd.exe" "/c $\"$INSTDIR\i2pbrowser-private.bat$\"" "$INSTDIR\ui2pbrowser_icon.ico"
 
+    ;# Point the browser config setting in the base router.config
+    FileOpen $0 "$I2PINSTEXE\router.config" a
+    FileSeek $0 0 END
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
+    FileWrite $0 "routerconsole.browser=$\"$INSTDIR\i2pconfig.bat$\""
+    FileWriteByte $0 "13"
+    FileWriteByte $0 "10"
+    FileClose $0
 
     SetShellVarContext current
     Var /Global I2PAPPDATA 
+
     IfFileExists "$I2PINSTEXE\clients.config" 0 +2
         StrCpy $I2PAPPDATA "$I2PINSTEXE"
     IfFileExists "$APPDATA\I2P\clients.config.d" 0 +2
         StrCpy $I2PAPPDATA "$APPDATA\I2P\"
     IfFileExists "$LOCALAPPDATA\I2P\clients.config.d" 0 +2
         StrCpy $I2PAPPDATA "$LOCALAPPDATA\I2P\"
-
+    IfFileExists "$LOCALAPPDATA\I2P\clients.config" 0 +2
+        StrCpy $I2PAPPDATA "$LOCALAPPDATA\I2P\"
 
     createDirectory "$I2PAPPDATA"
     SetOutPath "$I2PAPPDATA"
-    
-    ;# Point the browser config setting
+
+    ;# Point the browser config setting in the working config
     FileOpen $0 "$I2PAPPDATA\router.config" a
     FileSeek $0 0 END
     FileWriteByte $0 "13"
@@ -327,6 +365,9 @@ Section Install
     FileWriteByte $0 "10"
     FileClose $0
 
+    createDirectory "$I2PINSTEXE"
+    SetOutPath "$I2PINSTEXE"
+
     SetOutPath "$INSTDIR"
     # create the uninstaller
     WriteUninstaller "$INSTDIR\uninstall-i2pbrowser.exe"
@@ -349,25 +390,25 @@ Section "uninstall"
     Delete $INSTDIR\ui2pbrowser_icon.ico
 
     # Uninstall the profile
-    Delete $LOCALAPPDATA\${APPNAME}\firefox.profile.i2p\prefs.js
-    Delete $LOCALAPPDATA\${APPNAME}\firefox.profile.i2p\user.js
-    Delete $LOCALAPPDATA\${APPNAME}\firefox.profile.i2p\bookmarks.html
-    Delete $LOCALAPPDATA\${APPNAME}\firefox.profile.i2p\storage-sync.sqlite
+    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 $LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p\prefs.js
-    Delete $LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p\user.js
-    Delete $LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p\bookmarks.html
-    Delete $LOCALAPPDATA\${APPNAME}\firefox.profile.config.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 "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p\extensions\{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
-    Delete "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p\extensions\https-everywhere-eff@eff.org.xpi"
-    Delete "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p\extensions\i2ppb@eyedeekay.github.io.xpi"
+    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\i2prhz@eyedeekay.github.io.xpi"
 
-    Delete "$LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p\extensions\https-everywhere-eff@eff.org.xpi"
-    Delete "$LOCALAPPDATA\${APPNAME}\firefox.profile.config.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\i2prhz@eyedeekay.github.io.xpi"
 
-    Delete "$LOCALAPPDATA\${APPNAME}\firefox.profile.config.i2p\config\userChrome.css"
+    Delete "$INSTDIR\firefox.profile.config.i2p\config\userChrome.css"
 
     # Remove shortcuts and folders
     Delete "$SMPROGRAMS\${APPNAME}\${APPNAME}.lnk"
@@ -376,8 +417,8 @@ Section "uninstall"
     Delete "$DESKTOP\${APPNAME}.lnk"
     Delete "$DESKTOP\Private Browsing-${APPNAME}.lnk"
     rmDir "$SMPROGRAMS\${APPNAME}"
-    rmDir "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p\extensions"
-    rmDir "$LOCALAPPDATA\${APPNAME}\firefox.profile.i2p"
+    rmDir "$INSTDIR\firefox.profile.i2p\extensions"
+    rmDir "$INSTDIR\firefox.profile.i2p"
     rmDir "$LOCALAPPDATA\${APPNAME}"
     rmDir "$INSTDIR"
 

src/nsis/i2pbrowser-version.nsi

@@ -1,3 +1,3 @@
 !define VERSIONMAJOR 0
-!define VERSIONMINOR 03
+!define VERSIONMINOR 04
 !define VERSIONBUILD 

src/profile/version.txt

@@ -1 +1 @@
-0.3
+0.4