- tor-commits - lists.torproject.org

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

28 Aug '11

commit a373383064afe14adfbe7cbc56253bc217c3d0fd 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 (cherry picked from commit 69bea9b7c46b23662fb0ae456997e482a0ad1222) --- 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] Complain properly when both 'tor' and 'vidalia' are running
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit c9b2015f0ff13c2fd794c671190977ad2dd3fb9d 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. (cherry picked from commit 59e48ff7af775140a3209f52aef8640de1da7ead) --- 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] Unbreak the "foozer is already running as PID 31337." message
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 45f1a188c0f00d09e32fbe50a1f01fe99f2ea90f 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. (cherry picked from commit 0ca62c9b335c7a4e76c12ad4397f6e7653be89e0) --- 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] Properly detect being run from a GUI program started by startx
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit e38c3b482d537efd140b7cc6b290df50312449e2 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 (cherry picked from commit bd0cdaafaa4b53c258fd6ba591d4be1c4e8ead96) --- 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] [2525 Linux] Handle being launched using a symlink
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 49c7b9bacfa962db8a463d1099110b96ea3e3b97 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 03:10:31 2011 -0400 [2525 Linux] Handle being launched using a symlink (cherry picked from commit 7bf12712a8aa2556fdb023c69bbf51d727a17b90) --- src/RelativeLink/RelativeLink.sh | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index fd8ed0c..1321e0c 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -103,9 +103,24 @@ if [ -z "$XAUTHORITY" ]; then export XAUTHORITY fi +# If this script is being run through a symlink, we need to know where +# in the filesystem the script itself is, not where the symlink is. +myname="$0" +while [ -L "$myname" ]; do + # XXX readlink is not POSIX, but is present in GNU coreutils + # and on FreeBSD. Unfortunately, the -f option (which follows + # a whole chain of symlinks until it reaches a non-symlink + # path name) is a GNUism, so we can't safely use it. (Using + # it would be rude to FreeBSD users who currently have no + # other officially supported choice than TBB for Linux, and + # might even break compatibility with older versions of the + # GNU utility.) + myname="`readlink -n "$myname"`" +done + # Try to be agnostic to where we're being started from, chdir to where # the script is. -mydir="$(dirname "$0")" +mydir="$(dirname "$myname")" 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] Quote another variable expansion that should be quoted
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 57c1bc3f1643993419bd459a42df2cf5a64a45a7 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. (cherry picked from commit 02148bded38663e0906a4a63f7783a245ce4fe0b) --- 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] Print a message to stdout when Vidalia/TBB exits cleanly
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 17f0ad4846c9700918aee9c18ddf95dda4ef48c2 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 (cherry picked from commit 74e8804d1c332bb3d1a23fa8fdd9ac397176aa32) --- 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] Be more strict about entering debug mode
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 5d9c3ad0228b3884a0913f01ae1646a5cad70f6e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 03:32:49 2011 -0400 [Linux] Be more strict about entering debug mode Previously, a GUI user could start TBB in debug mode by dragging and dropping a file onto start-tor-browser. Found by taylanub (see ticket #3432). (cherry picked from commit 76596fca6bfd65df9502832d53e5e0f75ef01f4b) --- src/RelativeLink/RelativeLink.sh | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 5fd0acc..462ca98 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -90,9 +90,12 @@ if [ "`id -u`" -eq 0 ]; then exit 1 fi -if [ "$1" ]; then - debug="$1" +if [ "$#" -eq 1 -a "x$1" = "x--debug" ]; then + debug=1 printf "\nDebug enabled.\n\n" +elif [ "$#" -ne 0 ]; then + complain "usage: $0 [--debug]" + exit 1 fi # If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority

1 0

[torbrowser/maint-2.2] [Linux] Use ` ` instead of $( ) for consistency
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit f04699117137c662b98d96cf85e8632b4dbec575 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 03:21:10 2011 -0400 [Linux] Use ` ` instead of $( ) for consistency (cherry picked from commit 756d8db1ecadd09a8d8f947187ef31e8c40ff912) --- 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 7c2dc7d..5fd0acc 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -120,7 +120,7 @@ done # Try to be agnostic to where we're being started from, chdir to where # the script is. -mydir="$(dirname "$myname")" +mydir="`dirname "$myname"`" 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] Bump RelativeLink.sh copyright date
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 38b9d4f1939b415bc3dead5747fb35a715766b90 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 03:16:54 2011 -0400 [Linux] Bump RelativeLink.sh copyright date (cherry picked from commit 2044a3065b8fe8523cb632057764a2b03432a168) --- 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 22c6af2..7c2dc7d 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -5,7 +5,7 @@ # # To run in debug mode simply pass --debug # -# Copyright 2010 The Tor Project. See LICENSE for licensing information. +# Copyright 2011 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.

1 0