- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] Merge branches 'fixes-2011-08-23-01-master' and 'master'
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit ccaaff799914e929231ec69d22d2d6fb725663b1 Merge: 52906e8 fa3a87a Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 13:09:49 2011 +0100 Merge branches 'fixes-2011-08-23-01-master' and 'master' build-scripts/linux.mk | 2 +- src/RelativeLink/RelativeLink.sh | 176 +++++++++++++++++++++++++++++++++---- 2 files changed, 158 insertions(+), 20 deletions(-)

1 0

[torbrowser/maint-2.2] [Linux] Quote $XAUTHORITY properly
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 60e114c5598a6c3b2615745b8c49e1a45fab8052 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 01:46:42 2011 -0400 [Linux] Quote $XAUTHORITY properly I would be moderately surprised if any program put a shell metacharacter in that variable, but it could happen. --- src/RelativeLink/RelativeLink.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 99e5255..33961c9 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -14,7 +14,7 @@ if [ $1 ]; then printf "\nDebug enabled.\n\n" fi -if [ -z $XAUTHORITY ]; then +if [ -z "$XAUTHORITY" ]; then XAUTHORITY=~/.Xauthority export XAUTHORITY fi

1 0

[torbrowser/maint-2.2] [Linux] Quote another variable expansion that should be quoted
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 02148bded38663e0906a4a63f7783a245ce4fe0b Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 02:59:53 2011 -0400 [Linux] Quote another variable expansion that should be quoted Otherwise, bad things can happen if TBB is in a directory whose name contains spaces. --- src/RelativeLink/RelativeLink.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index a6287bc..fd8ed0c 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -105,7 +105,7 @@ fi # Try to be agnostic to where we're being started from, chdir to where # the script is. -mydir="$(dirname $0)" +mydir="$(dirname "$0")" test -d "$mydir" && cd "$mydir" # If ${PWD} results in a zero length HOME, we can try something else...

1 0

[torbrowser/maint-2.2] [Linux] Document why we need to set XAUTHORITY in this script
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 34cdd1dcc58adc55e04549698349c060f6378648 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 01:55:32 2011 -0400 [Linux] Document why we need to set XAUTHORITY in this script Otherwise, some GDM user who doesn't know why it needs to be set here will remove this chunk of script someday. --- src/RelativeLink/RelativeLink.sh | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 33961c9..09013a9 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -14,6 +14,9 @@ if [ $1 ]; then printf "\nDebug enabled.\n\n" fi +# If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority +# before we change HOME below. (See xauth(1) and #1945.) XDM and KDM rely +# on applications using this default value. if [ -z "$XAUTHORITY" ]; then XAUTHORITY=~/.Xauthority export XAUTHORITY

1 0

[torbrowser/maint-2.2] [Linux] Complain properly when both 'tor' and 'vidalia' are running
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 59e48ff7af775140a3209f52aef8640de1da7ead Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 01:51:18 2011 -0400 [Linux] Complain properly when both 'tor' and 'vidalia' are running There is now an unfortunate blank line at the beginning of the message; I don't know how to fix it with plain POSIX sh. --- src/RelativeLink/RelativeLink.sh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 708b68e..e5239a6 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -106,18 +106,18 @@ export DYLD_PRINT_LIBRARIES # if any relevant processes are running, inform the user and exit cleanly RUNNING=0 +RUNNING_MESSAGE="" for process in tor vidalia # FIXME pidof isn't POSIX do pid="`pidof $process`" if [ -n "$pid" ]; then - printf "\n$process is already running as PID $pid\n\n" + RUNNING_MESSAGE="`printf "%s\n%s is already running as PID %s." "$RUNNING_MESSAGE" "$process" "$pid"`" RUNNING=1 - break fi done if [ "$RUNNING" -eq 1 ]; then - complain "`printf "%s is already running as PID %s.\n\nPlease shut down the above process(es) before running Tor Browser Bundle." "$process" "$pid"`" + complain "`printf "%s\n\nPlease shut down the above process(es) before running Tor Browser Bundle." "$RUNNING_MESSAGE"`" exit 1 fi

1 0

[torbrowser/maint-2.2] [Linux] Use complain to report all currently detected errors
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 69bea9b7c46b23662fb0ae456997e482a0ad1222 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 00:47:15 2011 -0400 [Linux] Use complain to report all currently detected errors --- src/RelativeLink/RelativeLink.sh | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 0435054..5be1bdc 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -59,7 +59,7 @@ complain () { } if [ "`id -u`" -eq 0 ]; then - echo "The Tor Browser Bundle should not be run as root. Exiting." + complain "The Tor Browser Bundle should not be run as root. Exiting." exit 1 fi @@ -107,16 +107,18 @@ export DYLD_PRINT_LIBRARIES # if any relevant processes are running, inform the user and exit cleanly RUNNING=0 for process in tor vidalia + # FIXME pidof isn't POSIX do pid="`pidof $process`" if [ -n "$pid" ]; then printf "\n$process is already running as PID $pid\n\n" RUNNING=1 + break fi done -if [ $RUNNING -eq 1 ]; then - printf "Please shut down the above process(es) before running Tor Browser Bundle.\n\n" - exit 0 +if [ "$RUNNING" -eq 1 ]; then + complain "$process is already running as PID $pid."$'\n\n'"Please shut down the above process(es) before running Tor Browser Bundle." + exit 1 fi @@ -148,4 +150,8 @@ fi printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n" cd "${HOME}" ./App/vidalia --datadir Data/Vidalia/ -printf "\nExited cleanly. Goodbye.\n" +exitcode="$?" +if [ "$exitcode" -ne 0 ]; then + complain "Vidalia exited abnormally. Exit code: $exitcode" + exit "$exitcode" +fi

1 0

[torbrowser/maint-2.2] [Linux] Properly detect being run from a GUI program started by startx
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit bd0cdaafaa4b53c258fd6ba591d4be1c4e8ead96 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 02:55:08 2011 -0400 [Linux] Properly detect being run from a GUI program started by startx --- src/RelativeLink/RelativeLink.sh | 47 +++++++++++++++++++++++++++++-------- 1 files changed, 37 insertions(+), 10 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index e5239a6..a6287bc 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -7,21 +7,52 @@ # # Copyright 2010 The Tor Project. See LICENSE for licensing information. +# First, make sure DISPLAY is set. If it isn't, we're hosed; scream +# at stderr and die. +if [ "x$DISPLAY" = "x" ]; then + echo "The Tor Browser Bundle for Linux must be run within the X Window System." >&2 + echo "Exiting." >&2 + exit 1 +fi + +# Determine whether we are running in a terminal. If we are, we +# should send our error messages to stderr... +ARE_WE_RUNNING_IN_A_TERMINAL=0 +if [ -t 1 -o -t 2 ]; then + ARE_WE_RUNNING_IN_A_TERMINAL=1 +fi + +# ...unless we're running in the same terminal as startx or xinit. In +# that case, the user is probably running us from a GUI file manager +# in an X session started by typing startx at the console. +# +# Hopefully, the local ps command supports BSD-style options. (The ps +# commands usually used on Linux and FreeBSD do; do any other OSes +# support running Linux binaries?) +ps T 2>/dev/null |grep startx 2>/dev/null |grep -v grep 2>&1 >/dev/null +not_running_in_same_terminal_as_startx="$?" +ps T 2>/dev/null |grep xinit 2>/dev/null |grep -v grep 2>&1 >/dev/null +not_running_in_same_terminal_as_xinit="$?" + +# not_running_in_same_terminal_as_foo has the value 1 if we are *not* +# running in the same terminal as foo. +if [ "$not_running_in_same_terminal_as_startx" -eq 0 -o \ + "$not_running_in_same_terminal_as_xinit" -eq 0 ]; then + ARE_WE_RUNNING_IN_A_TERMINAL=0 +fi + # Complain about an error, by any means necessary. # Usage: complain message # message must not begin with a dash. complain () { # If we're being run in a terminal, complain there. - # - # FIXME Hopefully the user didn't run startx on the console and then - # double-click 'start-tor-browser' in a GUI file manager. - if [ -t 2 ]; then + if [ "$ARE_WE_RUNNING_IN_A_TERMINAL" -ne 0 ]; then echo "$1" >&2 return fi - # Otherwise, hope that we're being run in a GUI of some sort, - # and try to pop up a message there in the nicest way + # Otherwise, we're being run by a GUI program of some sort; + # try to pop up a message in the GUI in the nicest way # possible. # # In mksh, non-existent commands return 127; I'll assume all @@ -30,10 +61,6 @@ complain () { # close button, so we do need to look at the exact exit code, # not just assume the command failed to display a message if # it returns non-zero.) - # - # If DISPLAY isn't set, the first command on the list will - # fail with a non-127 exit code; that feels wrong somehow, but - # there's nothing better we can do in that case anyway. # First, try zenity. zenity --error --text="$1"

1 0

[torbrowser/maint-2.2] [Linux] Unbreak the "foozer is already running as PID 31337." message
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 0ca62c9b335c7a4e76c12ad4397f6e7653be89e0 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 01:21:17 2011 -0400 [Linux] Unbreak the "foozer is already running as PID 31337." message The $'\n\n' didn't do what I thought it would do. bashism? zshism? I have no idea where I saw that syntax. Still not quite right, because it used to (try to) complain about both Tor and Vidalia at the same time if both were running. --- src/RelativeLink/RelativeLink.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 5be1bdc..708b68e 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -117,7 +117,7 @@ for process in tor vidalia done if [ "$RUNNING" -eq 1 ]; then - complain "$process is already running as PID $pid."$'\n\n'"Please shut down the above process(es) before running Tor Browser Bundle." + complain "`printf "%s is already running as PID %s.\n\nPlease shut down the above process(es) before running Tor Browser Bundle." "$process" "$pid"`" exit 1 fi

1 0

[torbrowser/maint-2.2] [Linux] Print a message to stdout when Vidalia/TBB exits cleanly
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit 74e8804d1c332bb3d1a23fa8fdd9ac397176aa32 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 03:14:39 2011 -0400 [Linux] Print a message to stdout when Vidalia/TBB exits cleanly --- src/RelativeLink/RelativeLink.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 1321e0c..22c6af2 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -196,4 +196,6 @@ exitcode="$?" if [ "$exitcode" -ne 0 ]; then complain "Vidalia exited abnormally. Exit code: $exitcode" exit "$exitcode" +else + echo '\nVidalia exited cleanly.\n' fi

1 0

[torbrowser/maint-2.2] [Linux] Add a 'complain' shell function to RelativeLink.sh
by erinn＠torproject.org 24 Oct '11

24 Oct '11

commit e167e931c8e75d3915317ae3da5d3da747ef5065 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 00:46:50 2011 -0400 [Linux] Add a 'complain' shell function to RelativeLink.sh If the user is running start-tor-browser from a GUI file manager, he/she/it probably won't see any messages we output to stdout/stderr. The 'complain' function tries to make sure the user will actually see an error message. --- src/RelativeLink/RelativeLink.sh | 51 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index fe00dcd..0435054 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -7,6 +7,57 @@ # # Copyright 2010 The Tor Project. See LICENSE for licensing information. +# Complain about an error, by any means necessary. +# Usage: complain message +# message must not begin with a dash. +complain () { + # If we're being run in a terminal, complain there. + # + # FIXME Hopefully the user didn't run startx on the console and then + # double-click 'start-tor-browser' in a GUI file manager. + if [ -t 2 ]; then + echo "$1" >&2 + return + fi + + # Otherwise, hope that we're being run in a GUI of some sort, + # and try to pop up a message there in the nicest way + # possible. + # + # In mksh, non-existent commands return 127; I'll assume all + # other shells set the same exit code if they can't run a + # command. (xmessage returns 1 if the user clicks the WM + # close button, so we do need to look at the exact exit code, + # not just assume the command failed to display a message if + # it returns non-zero.) + # + # If DISPLAY isn't set, the first command on the list will + # fail with a non-127 exit code; that feels wrong somehow, but + # there's nothing better we can do in that case anyway. + + # First, try zenity. + zenity --error --text="$1" + if [ "$?" -ne 127 ]; then + return + fi + + # Try xmessage. + xmessage "$1" + if [ "$?" -ne 127 ]; then + return + fi + + # Try gxmessage. This one isn't installed by default on + # Debian with the default GNOME installation, so it seems to + # be the least likely program to have available, but it might + # be used by one of the 'lightweight' Gtk-based desktop + # environments. + gxmessage "$1" + if [ "$?" -ne 127 ]; then + return + fi +} + if [ "`id -u`" -eq 0 ]; then echo "The Tor Browser Bundle should not be run as root. Exiting." exit 1

1 0