summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2019-03-11 15:50:40 +0000
committerintrigeri <intrigeri@boum.org>2019-03-11 15:50:40 +0000
commitc3e4e2caf1b81d879857d6425a938abbcb82e4ed (patch)
treead47031d4d4dd570b406c848fd38451004476af5
parent6abd762670349b78489f73d25acfad6566d68961 (diff)
parentd7fcf03aba7fdaf9d783fa30a7f870a0d43d3678 (diff)
Merge branch 'bugfix/16338-tor-launcher-localization+force-all-tests' into stable (Fix-committed: #16338)
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tor-launcher13
1 files changed, 9 insertions, 4 deletions
diff --git a/config/chroot_local-includes/usr/local/bin/tor-launcher b/config/chroot_local-includes/usr/local/bin/tor-launcher
index e610166..f2b01b3 100755
--- a/config/chroot_local-includes/usr/local/bin/tor-launcher
+++ b/config/chroot_local-includes/usr/local/bin/tor-launcher
@@ -2,8 +2,10 @@
set -e
-# Import the TOR_LAUNCHER_INSTALL variable, and exec_unconfined_firefox()
-# and configure_best_tor_launcher_locale()
+# Import:
+# - the TBB_EXT and TOR_LAUNCHER_INSTALL variables;
+# - the exec_unconfined_firefox() and configure_best_tor_launcher_locale()
+# functions.
. /usr/local/lib/tails-shell-library/tor-browser.sh
unset TOR_CONTROL_PASSWD
@@ -18,8 +20,11 @@ fi
PROFILE="${HOME}/.tor-launcher/profile.default"
if [ ! -d "${PROFILE}" ]; then
- mkdir -p "${PROFILE}"
- configure_best_tor_launcher_locale "${PROFILE}"
+ mkdir -p "${PROFILE}/extensions"
+ for ext in "${TBB_EXT}"/langpack-*.xpi; do
+ ln -s "${ext}" "${PROFILE}/extensions/"
+ done
+ configure_best_tor_launcher_locale "${PROFILE}"
fi
exec_unconfined_firefox \