summaryrefslogtreecommitdiff
path: root/libre/iceweasel
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2018-08-23 14:45:43 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2018-08-23 16:05:22 -0400
commit602610926467f38b237ad62d00538578c5bd181c (patch)
tree57c365d77eff4032261bf0dc8160387b08f16a6c /libre/iceweasel
parentda5d76e73fa4e901094c3bb1c0c3fcadb5f7df38 (diff)
downloadabslibre-602610926467f38b237ad62d00538578c5bd181c.tar.gz
abslibre-602610926467f38b237ad62d00538578c5bd181c.tar.bz2
abslibre-602610926467f38b237ad62d00538578c5bd181c.zip
libre/iceweasel: Clean up hilariously over-quoted sed expressions
Also, we run package() with errtrap; no need to `|| die` after things.
Diffstat (limited to 'libre/iceweasel')
-rw-r--r--libre/iceweasel/PKGBUILD24
1 files changed, 12 insertions, 12 deletions
diff --git a/libre/iceweasel/PKGBUILD b/libre/iceweasel/PKGBUILD
index 04b685208..a083bff6b 100644
--- a/libre/iceweasel/PKGBUILD
+++ b/libre/iceweasel/PKGBUILD
@@ -141,14 +141,14 @@ END
# Patch and remove anything that's left
patch -Np1 -i "$srcdir/libre.patch"
- sed -i 's|Adobe Flash|SWF Player|g;
- ' browser/base/content/pageinfo/permissions.js \
- browser/base/content/browser-plugins.js
- sed -i '\|["]displayName["][:] ["]Flash["]| s|Flash|SWF Player|
- \|["]displayName["][:] ["]Shockwave["]| s|Shockwave|DCR Player|
- \|["]displayName["][:] ["]QuickTime["]| s|QuickTime|MOV Player|
- \|installLinux| s|true|false|
- ' browser/base/content/browser-plugins.js
+ sed -i 's/Adobe Flash/SWF Player/g' -- \
+ browser/base/content/pageinfo/permissions.js \
+ browser/base/content/browser-plugins.js
+ sed -e '/"displayName": "Flash"/ s/Flash/SWF Player/' \
+ -e '/"displayName": "Shockwave"/ s/Shockwave/DCR Player/' \
+ -e '/"displayName": "QuickTime"/ s/QuickTime/MOV Player/' \
+ -e '/installLinux/ s/true/false/' \
+ -i -- browser/base/content/browser-plugins.js
# re-use 'abouthome' page for 'newtab' page
install -d browser/base/content/newtab
@@ -159,10 +159,10 @@ END
cp -av /usr/lib/mozilla/searchplugins browser/locales
# Disable various components at the source level
- sed -i 's|[;]1|;0|' toolkit/components/telemetry/TelemetryStartup.manifest || die "failed break telemetry startup"
- #sed -i 's|[;]1|;0|' browser/experiments/Experiments.manifest || die "failed to break ExperimentsService"
- sed -i '/pocket/d' browser/extensions/moz.build || die "failed to wipe pocket"
- sed -i '/activity-stream/d' browser/extensions/moz.build || die "failed to wipe activity-stream"
+ sed -i 's/;1/;0/' toolkit/components/telemetry/TelemetryStartup.manifest
+ #sed -i 's/;1/;0/' browser/experiments/Experiments.manifest
+ sed -i '/pocket/d' browser/extensions/moz.build
+ sed -i '/activity-stream/d' browser/extensions/moz.build
}
build() {