summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranonym <anonym@riseup.net>2015-09-11 22:23:56 +0200
committeranonym <anonym@riseup.net>2016-02-09 17:27:49 +0100
commit06bc25133af394ed2bda2586484d35678a47663e (patch)
treedd2a6c1c942d31c46632cd33ed820bd2f1fffb16
parent42b1cf448517abd2143bfb33019b54fb191bfabd (diff)
Move tor-launcher-standalone into /usr/local/lib.
... where we have the Tor Browser. For consistency.
-rwxr-xr-xconfig/chroot_local-hooks/10-tbb8
-rwxr-xr-xconfig/chroot_local-hooks/20-xul-ext_symlinks2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/bin/tor-launcher2
-rw-r--r--config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/sbin/tails-tor-launcher4
-rw-r--r--features/step_definitions/browser.rb2
6 files changed, 10 insertions, 10 deletions
diff --git a/config/chroot_local-hooks/10-tbb b/config/chroot_local-hooks/10-tbb
index 9c4a008..6be4f53 100755
--- a/config/chroot_local-hooks/10-tbb
+++ b/config/chroot_local-hooks/10-tbb
@@ -70,11 +70,11 @@ install_tor_browser() {
# profile but we want to keep it as a standalone application
# when Tails is started in "bridge mode".
torlauncher_xpi_path="${prep}/TorBrowser/Data/Browser/profile.default/extensions/tor-launcher@torproject.org.xpi"
- 7z x -o'/usr/share/tor-launcher-standalone' "${torlauncher_xpi_path}"
+ 7z x -o'/usr/local/lib/tor-launcher-standalone' "${torlauncher_xpi_path}"
torlauncher_version="$(sed -n \
's,^ <em:version>\([0-9\.]\+\)</em:version>,\1,p' \
- '/usr/share/tor-launcher-standalone/install.rdf')"
- cat > '/usr/share/tor-launcher-standalone/application.ini' << EOF
+ '/usr/local/lib/tor-launcher-standalone/install.rdf')"
+ cat > '/usr/local/lib/tor-launcher-standalone/application.ini' << EOF
[App]
Vendor=TorProject
Name=TorLauncher
@@ -89,7 +89,7 @@ MaxVersion=*.*.*
[Shell]
Icon=icon.png
EOF
- chmod -R a+rX '/usr/share/tor-launcher-standalone'
+ chmod -R a+rX '/usr/local/lib/tor-launcher-standalone'
rm "${torlauncher_xpi_path}"
# The Tor Browser will fail, complaining about an incomplete profile,
diff --git a/config/chroot_local-hooks/20-xul-ext_symlinks b/config/chroot_local-hooks/20-xul-ext_symlinks
index 6428394..5331fae 100755
--- a/config/chroot_local-hooks/20-xul-ext_symlinks
+++ b/config/chroot_local-hooks/20-xul-ext_symlinks
@@ -5,4 +5,4 @@ set -e
echo "Creating prefs override for Tor Launcher"
ln -s /etc/xul-ext/tor-launcher.js \
- /usr/share/tor-launcher-standalone/defaults/preferences/000system.js
+ /usr/local/lib/tor-launcher-standalone/defaults/preferences/000system.js
diff --git a/config/chroot_local-includes/usr/local/bin/tor-launcher b/config/chroot_local-includes/usr/local/bin/tor-launcher
index 8a0711b..9a4f7a6 100755
--- a/config/chroot_local-includes/usr/local/bin/tor-launcher
+++ b/config/chroot_local-includes/usr/local/bin/tor-launcher
@@ -12,5 +12,5 @@ if [ ! -d "${PROFILE}" ]; then
fi
exec_unconfined_firefox \
- -app /usr/share/tor-launcher-standalone/application.ini \
+ -app /usr/local/lib/tor-launcher-standalone/application.ini \
-profile "${PROFILE}"
diff --git a/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh b/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh
index 709dc5c..94b1ce9 100644
--- a/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh
+++ b/config/chroot_local-includes/usr/local/lib/tails-shell-library/tor-browser.sh
@@ -3,7 +3,7 @@
TBB_INSTALL=/usr/local/lib/tor-browser
TBB_PROFILE=/etc/tor-browser/profile
TBB_EXT=/usr/local/share/tor-browser-extensions
-TOR_LAUNCHER_LOCALES_DIR=/usr/share/tor-launcher-standalone/chrome/locale
+TOR_LAUNCHER_LOCALES_DIR=/usr/local/lib/tor-launcher-standalone/chrome/locale
exec_firefox() {
LD_LIBRARY_PATH="${TBB_INSTALL}"
diff --git a/config/chroot_local-includes/usr/local/sbin/tails-tor-launcher b/config/chroot_local-includes/usr/local/sbin/tails-tor-launcher
index 0d5d8f9..af7e9b4 100755
--- a/config/chroot_local-includes/usr/local/sbin/tails-tor-launcher
+++ b/config/chroot_local-includes/usr/local/sbin/tails-tor-launcher
@@ -32,8 +32,8 @@ fi
# application.ini file supplied via -app. We can use -profile to load
# it from a different place, but then the Caches directory
# must still exist and be accessible in the above folder.
-mkdir -p /usr/share/TorBrowser/Data/Browser/Caches
-chmod -R a+rX /usr/share/TorBrowser
+mkdir -p /usr/local/lib/TorBrowser/Data/Browser/Caches
+chmod -R a+rX /usr/local/lib/TorBrowser
until pgrep -u "${LIVE_USERNAME}" '^ibus-daemon' >/dev/null ; do
sleep 5
diff --git a/features/step_definitions/browser.rb b/features/step_definitions/browser.rb
index e3d1028..24f604d 100644
--- a/features/step_definitions/browser.rb
+++ b/features/step_definitions/browser.rb
@@ -53,7 +53,7 @@ def xul_application_info(application)
new_tab_button_image = "I2PBrowserNewTabButton.png"
when "Tor Launcher"
user = "tor-launcher"
- cmd_regex = "#{binary} -app /usr/share/tor-launcher-standalone/application\.ini"
+ cmd_regex = "#{binary}\s+-app /usr/local/lib/tor-launcher-standalone/application\.ini"
chroot = ""
new_tab_button_image = nil
address_bar_image = nil