summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-08-09 13:46:39 +0200
committeranonym <anonym@riseup.net>2015-08-09 13:46:39 +0200
commit2449b17fe22adadfd588061fa5f662c479e393f6 (patch)
treeb4f9bf635e83f9c83ba2894d1850a5e17243a574
parenta0e5365f600e3e67018f417c0243c1fb3af84b58 (diff)
Move block to more suitable place.
It has nothing to do with "Remove unwanted browser search plugins", and it feels safer to do this before we fix the permissions.
-rw-r--r--config/chroot_local-hooks/11-localize_browser11
1 files changed, 6 insertions, 5 deletions
diff --git a/config/chroot_local-hooks/11-localize_browser b/config/chroot_local-hooks/11-localize_browser
index fe7ed98..61c3abf 100644
--- a/config/chroot_local-hooks/11-localize_browser
+++ b/config/chroot_local-hooks/11-localize_browser
@@ -170,6 +170,12 @@ done < "${DESCRIPTIONS_FILE}"
# This directory is not needed after build time.
rm -r "${BROWSER_LOCALIZATION_DIR}"
+# We want our localized English Wikipedia plugin to be available in
+# all locales.
+cp "${TBB_LOCALIZED_SEARCHPLUGINS_DIR}/en-US/wikipedia-en-US.xml" \
+ "${TBB_DEFAULT_SEARCHPLUGINS_DIR}/"
+rm "${TBB_LOCALIZED_SEARCHPLUGINS_DIR}/en-US/wikipedia-en-US.xml"
+
# All generated files must be world-readable.
chmod -R a+rX "${TBB_LOCALIZED_SEARCHPLUGINS_DIR}" "${BRANDING_DIR}"
@@ -179,10 +185,5 @@ rm "${TBB_DEFAULT_SEARCHPLUGINS_DIR}"/yahoo*.xml
rm "${TBB_DEFAULT_SEARCHPLUGINS_DIR}"/disconnect*.xml
rm "${TBB_DEFAULT_SEARCHPLUGINS_DIR}"/startpage*.xml
rm "${TBB_DEFAULT_SEARCHPLUGINS_DIR}"/wikipedia*.xml
-# We want our localized English Wikipedia plugin to be available in
-# all locales.
-cp "${TBB_LOCALIZED_SEARCHPLUGINS_DIR}/en-US/wikipedia-en-US.xml" \
- "${TBB_DEFAULT_SEARCHPLUGINS_DIR}/"
-rm "${TBB_LOCALIZED_SEARCHPLUGINS_DIR}/en-US/wikipedia-en-US.xml"
apt-get --yes purge imagemagick