diff options
| -rw-r--r-- | libre/iceweasel/PKGBUILD | 24 | ||||
| -rwxr-xr-x | libre/iceweasel/rename-profile.sh | 99 |
2 files changed, 3 insertions, 120 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD index 0350de4b6..4014216f0 100644 --- a/libre/iceweasel/PKGBUILD +++ b/libre/iceweasel/PKGBUILD @@ -37,7 +37,6 @@ # - allow skipping profiling build for x86_64 (_x86_64_skip_pgo) # - prefer as many system libs as possible, over their vendored couterparts # - Rebrand to Iceweasel, per the mozilla trademark policy, due to the FSDG changes -# - set user profile directory to ~/.mozilla/iceweasel # # privacy: # - Remove Google API keys and usage @@ -62,8 +61,8 @@ pkgname=iceweasel epoch=1 pkgver=98.0 pkgrel=1 -pkgrel+=.parabola6 -_brandingver=98.0-1 +pkgrel+=.parabola7 +_brandingver=95.0-1 pkgdesc="Standalone web browser derived from Mozilla Firefox" arch=(x86_64) arch+=(armv7h i686) @@ -106,7 +105,7 @@ source_i686=('avoid-libxul-OOM-python-check.patch' sha256sums=('fd0a4c11d007d9045706667eb0f99f9b7422945188424cb937bfef530cb6f4dd' 'SKIP' '9cdc2602661717712092d28bb494e5b48e518cb930898aca85eaf21f91f7ef58') -sha256sums+=('f3e89499909b172476e931d9ab18b856d0001e3042b3816d1728809536179768' +sha256sums+=('d1b9d98cea5356df97fc5c221830de1ced8f826cb39fac9427c407e3eae54c02' 'SKIP' 'a4e3c3869085cb282cb5a0fcb64e816c0415f25d4792a62c4f1d599d3111b23c' 'cb3079a0dc30321183bf8e112532c6f2aad045f68103f8d422c9691137aa770e' @@ -676,21 +675,4 @@ END if [[ -e $nssckbi ]]; then ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi" fi - - - # BEGIN RENAME_PROFILE - # replace binary with a temporary wrapper, to rename the user profile directory - # NOTE: prior to v98, if another 'firefox' is installed in addition to iceweasel, - # both applications would share a profile, which is not very sane behavior. - # TODO: this 'rename-profile' source file, and the following two LOC, - # could be removed after a reasonable deprecation period (eg: in 2023) - mv "${pkgdir}"/usr/lib/iceweasel/ice{,-}weasel - install -Dm755 ../rename-profile.sh "${pkgdir}"/usr/lib/iceweasel/iceweasel - # END RENAME_PROFILE } - - -# BEGIN RENAME_PROFILE - temporary - see note in package() -depends+=(gxmessage) ; source+=(rename-profile.sh) ; -sha256sums+=('e8f8a53ff340e36912c39247d40b6c2915bbbe437d2fc21b3e7cc09b1b534389') -# END RENAME_PROFILE diff --git a/libre/iceweasel/rename-profile.sh b/libre/iceweasel/rename-profile.sh deleted file mode 100755 index 1ccdbdb7f..000000000 --- a/libre/iceweasel/rename-profile.sh +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/bash - -# NOTE: prior to v98, if another 'firefox' is installed in addition to iceweasel, -# both applications would share a profile, which is not very sane behavior. -# TODO: this file could be deleted after a reasonable deprecation period (eg: in 2023) - - -Defer() -{ - gxmessage -title "Iceweasel Updater" \ - -buttons "OK:0" \ - -default "OK" \ - -font "sans 16" \ - -geometry 620x460 \ - -center -wrap -ontop -sticky \ -"A new version of Iceweasel has been installed; -but the upgrade can not continue just yet. - -A previous version of Iceweasel is already running. - -Please close all running Iceweasel windows, -then start Iceweasel again. - -If this message persists, try restarting the computer." -} - -Prompt() -{ - gxmessage -title "Iceweasel Updater" \ - -buttons "Move:0,Copy:1" \ - -default "Move" \ - -font "monospace 12" \ - -geometry 780x580 \ - -center -wrap -ontop -sticky \ -"A new version of Iceweasel has been installed; but the upgrade can not continue just yet. - -This upgrade intends to move the storage location of the Iceweasel user profile, from ~/.mozilla/firefox to ~/.mozilla/iceweasel, in order to isolate it from other firefox variants. - -You have two options: - - * 'Move': This is the recommended option, - if you do not have any other Firefox variants installed. - However, if you have other Firefox variants installed, - Otherwise, the others' preferences may be reset to defaults. - Parabola does not distribute any other Firefox variant, - which would be affected by this decision. - If all software on your computer came from the Parabola repos - (as recommended), then 'Move' is the best option. - - * 'Copy': If you have other Firefox variants installed, - those will keep all user preferences as they are, - and Iceweasel will inherit the preferences. - -Note that neither option would affect Icecat, nor any other firefox variant -which does not store user profiles under ~/.mozilla/firefox. -" -} - - -# NOTE: the iceweasel binary is inaccessible via the normal means -# (`iceweasel`, `/usr/bin/iceweasel`, or the iceweasel.desktop launcher). -# the binary has been renamed to ice-weasel, and replaced by this script - -if [[ -d ~/.mozilla/firefox ]] && \ - ! [[ -e ~/.mozilla/iceweasel ]] -then # this is the most likely normal case, where the user has previously run - # either iceweasel or firefox on this system; - # and this is the first time that this script has run. - pids=( $(pgrep --euid ${EUID} firefox ) \ - $(pgrep --euid ${EUID} iceweasel) ) - if [[ -n "${pids[*]/$$/}" ]] - then # in this case, firefox or iceweasel is already running, - # so ask the user to terminate them - Defer - else # ready to move the profile directory. - # give the user the option to preserve the firefox profile, - # then launch the binary. - if Prompt - then mv ~/.mozilla/{firefox,iceweasel} - else cp -a ~/.mozilla/{firefox,iceweasel} - fi - /usr/lib/iceweasel/ice-weasel "$@" - fi -else # this branch is executed in any of four cases: - # 1) the user has compiled a modified version of iceweasel, - # modified precisely to do what this script is attempting, - # AND has also run some other firefox variant in the past. - # 2) the user has run iceweasel or some other firefox variant in the past, - # AND ~/.mozilla/iceweasel exists accidentally. - # 3) the user has previously selected 'Copy' during a previous run of this script, - # installed with a previous 'iceweasel' release. - # 4) the remaining normal case, where the user has never run - # neither iceweasel nor firefox on this system. - # cases 1 and 2 could be distinguished; but both are very unlikely. - # so, simply launch the binary, and hope for the best. - # this is potentially problematic; but only in the (unlikely) case #2. - # case #2 is easily resolved manually: $ rm -rf ~/.mozilla/iceweasel - /usr/lib/iceweasel/ice-weasel "$@" -fi |