Commit 06bc2513 authored by anonym's avatar anonym

Move tor-launcher-standalone into /usr/local/lib.

... where we have the Tor Browser. For consistency.
parent 42b1cf44
......@@ -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,
......
......@@ -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
......@@ -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}"
......@@ -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}"
......
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment