From d9025e5853d6c89c4baddd7eb3ef10baa392d41a Mon Sep 17 00:00:00 2001 From: idk Date: Tue, 1 Jun 2021 19:14:09 -0400 Subject: [PATCH] Switch to alternate version of I2PIPB which automatically configures home page to be extension-owned help page --- Makefile | 14 +++++++------- i2psetproxy.url | 2 +- src/nsis/i2pbrowser-installer.nsi | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index f56db75..c26f1f7 100644 --- a/Makefile +++ b/Makefile @@ -71,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 @@ -99,12 +99,12 @@ 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 -L `cat NoScript.url` > build/NoScript.xpi @@ -124,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 diff --git a/i2psetproxy.url b/i2psetproxy.url index 286e016..bc1178e 100644 --- a/i2psetproxy.url +++ b/i2psetproxy.url @@ -1 +1 @@ -https://addons.mozilla.org/firefox/downloads/file/3674169/0.106/i2ppb@eyedeekay.github.io.xpi +https://addons.mozilla.org/firefox/downloads/file/3784917/0.108/i2prhz@eyedeekay.github.io diff --git a/src/nsis/i2pbrowser-installer.nsi b/src/nsis/i2pbrowser-installer.nsi index ac0f75f..072c435 100644 --- a/src/nsis/i2pbrowser-installer.nsi +++ b/src/nsis/i2pbrowser-installer.nsi @@ -302,7 +302,7 @@ Section Install 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 profile\extensions\i2prhz@eyedeekay.github.io.xpi # Install the config profile createDirectory "$INSTDIR\firefox.profile.config.i2p" @@ -316,7 +316,7 @@ Section Install 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 + File profile\extensions\i2prhz@eyedeekay.github.io.xpi # Install the config userChrome createDirectory "$INSTDIR\firefox.profile.config.i2p\chrome" @@ -403,10 +403,10 @@ Section "uninstall" # 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.i2p\extensions\i2prhz@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\extensions\i2prhz@eyedeekay.github.io.xpi" Delete "$INSTDIR\firefox.profile.config.i2p\config\userChrome.css"