I2P_Developers/i2p.firefox
3
0
Fork 1
Code Issues 14 Pull Requests Actions 5 Packages Projects Releases Wiki Activity

switch to Rhizome variant of IPB plugin. Update extensions at install time

Browse Source
This commit is contained in:
idk
2021-07-01 10:26:19 -04:00
parent b62d64bb0f
commit a6481d7bd7
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -72,10 +72,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
@ -101,12 +101,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
@ -126,7 +126,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

19
src/nsis/i2pbrowser-installer.nsi
View File

@ -264,7 +264,10 @@ Section Install
FileWriteByte $0 "13"
FileWriteByte $0 "10"
FileWrite $0 'if exist "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p\" ('
FileWrite $0 ' echo "profile is configured"'
FileWrite $0 ' echo "profile is configured, updating extensions"'
FileWriteByte $0 "13"
FileWriteByte $0 "10"
FileWrite $0 ' xcopy /s /i /y "$INSTDIR\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p\extensions"'
FileWrite $0 ') else ('
FileWrite $0 ' echo "configuring profile"'
FileWriteByte $0 "13"
@ -294,6 +297,9 @@ Section Install
FileWriteByte $0 "10"
FileWrite $0 'if exist "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p\" ('
FileWrite $0 ' echo "profile is configured"'
FileWriteByte $0 "13"
FileWriteByte $0 "10"
FileWrite $0 ' xcopy /s /i /y "$INSTDIR\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p\extensions"'
FileWrite $0 ') else ('
FileWrite $0 ' echo "configuring profile"'
FileWriteByte $0 "13"
@ -320,6 +326,9 @@ Section Install
FileWriteByte $0 "10"
FileWrite $0 'if exist "%LOCALAPPDATA%\${APPNAME}\firefox.profile.config.i2p\" ('
FileWrite $0 ' echo "profile is configured"'
FileWriteByte $0 "13"
FileWriteByte $0 "10"
FileWrite $0 ' xcopy /s /i /y "$INSTDIR\firefox.profile.i2p\extensions" "%LOCALAPPDATA%\${APPNAME}\firefox.profile.i2p\extensions"'
FileWrite $0 ') else ('
FileWrite $0 ' echo "configuring profile"'
FileWriteByte $0 "13"
@ -356,7 +365,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"
@ -370,7 +379,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"
@ -457,10 +466,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"

2
src/unix/i2pbrowser.sh
View File

@ -19,6 +19,8 @@ fi
if [ ! -d "$BROWSING_PROFILE" ]; then
mkdir -p "$BROWSING_PROFILE"
cp -vr /var/lib/i2pbrowser/profile/* "$BROWSING_PROFILE"
else
cp -vr /var/lib/i2pbrowser/profile/extensions/* "$BROWSING_PROFILE/extensions"
fi
if [ ! -f "$BROWSING_PROFILE/user.js" ]; then

2
src/unix/i2pconfig.sh
View File

@ -35,6 +35,8 @@ fi
if [ ! -d "$CONFIGURING_PROFILE" ]; then
mkdir -p "$CONFIGURING_PROFILE"
cp -vr /var/lib/i2pbrowser/app-profile/* "$CONFIGURING_PROFILE"
else
cp -vr /var/lib/i2pbrowser/profile/extensions/* "$CONFIGURING_PROFILE/extensions"
fi
if [ ! -f "$CONFIGURING_PROFILE/user.js" ]; then