Commit 15bb44cb authored by Tails developers's avatar Tails developers

Remove the iceweasel wrapper script.

It's unused now that we use the TBB.
parent 459ba93f
#!/bin/sh
# Do not "set -u", else importing gettext.sh dies
# with "ZSH_VERSION: parameter not set".
set -e
. gettext.sh
TEXTDOMAIN="tails"
export TEXTDOMAIN
ask_for_confirmation() {
local dialog_title="`gettext \"Tor is not ready\"`"
local dialog_text="`gettext \"Tor is not ready. Start Tor Browser anyway?\"`"
local dialog_start="`gettext \"Start Tor Browser\"`"
local dialog_cancel="`gettext \"Cancel\"`"
# zenity can't set the default button to cancel, so we switch the
# labels and interpret the return value as its negation.
! zenity --question \
--title "$dialog_title" --text="$dialog_text" \
--cancel-label "$dialog_start" --ok-label "$dialog_cancel"
}
tor_has_bootstrapped() {
sudo -n -u debian-tor /usr/local/sbin/tor-has-bootstrapped
}
if tor_has_bootstrapped || ask_for_confirmation; then
# Torbutton 1.5.1+ uses those environment variables
export TOR_SOCKS_HOST='127.0.0.1'
export TOR_SOCKS_PORT='9151'
exec /usr/bin/iceweasel "$@" &
fi
......@@ -2,7 +2,6 @@
tmp/pot/60-tor-ready-notification.sh.pot
tmp/pot/config.py.pot
tmp/pot/gpgApplet.pot
tmp/pot/iceweasel.pot
tmp/pot/shutdown-helper-applet.pot
tmp/pot/tails-about.pot
tmp/pot/tails-additional-software.pot
......
......@@ -10,7 +10,6 @@ PERL_PROGS="/usr/local/bin/gpgApplet /usr/local/bin/tails-security-check \
PYTHON_PROGS="/etc/whisperback/config.py /usr/local/lib/shutdown-helper-applet \
/usr/local/bin/tails-about /usr/local/sbin/tails-additional-software"
SHELL_PROGS="/etc/NetworkManager/dispatcher.d/60-tor-ready-notification.sh \
/usr/local/bin/iceweasel \
/usr/local/bin/tails-upgrade-frontend-wrapper \
/usr/local/sbin/tails-spoof-mac \
/usr/local/sbin/unsafe-browser /usr/share/tails/truecrypt-wrapper.disabled"
......
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