August 2011 - tor-commits - lists.torproject.org

[torbrowser/master] [Linux] Exit successfully when run with the --help option
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 71a997097d59f85d6a02a50e620092f92a684728 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:55:19 2011 -0400 [Linux] Exit successfully when run with the --help option --- 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 04d91fa..248750e 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -119,7 +119,7 @@ if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then printf "\nDebug enabled.\n\n" elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then echo "$usage_message" - exit 1 + exit 0 elif [ "$#" -ne 0 ]; then complain "$usage_message" exit 1

1 0

[torbrowser/master] [Linux] Start TBB anyway when the launcher script is run with invalid args
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit fa3a87a1837b30590f20918c41904e264816bd0e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 07:07:05 2011 -0400 [Linux] Start TBB anyway when the launcher script is run with invalid args Suggested by velope, because the most likely cause of oddball command-line arguments is that someone dragged-and-dropped one or more files on the start-tor-browser icon using a GUI file manager. --- src/RelativeLink/RelativeLink.sh | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 248750e..1d2f4e3 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -120,9 +120,6 @@ if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then echo "$usage_message" exit 0 -elif [ "$#" -ne 0 ]; then - complain "$usage_message" - exit 1 fi # If XAUTHORITY is unset, set it to its default value of $HOME/.Xauthority @@ -212,6 +209,8 @@ if [ "${debug}" ]; then printf "\nStarting Vidalia now\n" cd "${HOME}" printf "\nLaunching Vidalia from: `pwd`\n" + # XXX Someday we should pass whatever command-line arguments we got + # (probably filenames or URLs) to Firefox. ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ --datadir Data/Vidalia/ printf "\nVidalia exited with the following return code: $?\n" @@ -221,6 +220,8 @@ fi # not in debug mode, run proceed normally printf "\nLaunching Tor Browser Bundle for Linux in ${HOME}\n" cd "${HOME}" +# XXX Someday we should pass whatever command-line arguments we got +# (probably filenames or URLs) to Firefox. ./App/vidalia --datadir Data/Vidalia/ exitcode="$?" if [ "$exitcode" -ne 0 ]; then

1 0

[torbrowser/master] Merge branches 'fixes-2011-08-23-01-master' and 'master'
by erinn＠torproject.org 28 Aug '11

28 Aug '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/master] [Linux] Quote another variable expansion that should be quoted
by erinn＠torproject.org 28 Aug '11

28 Aug '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/master] [Linux] Properly detect being run from a GUI program started by startx
by erinn＠torproject.org 28 Aug '11

28 Aug '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/master] [Linux] Print a message to stdout when Vidalia/TBB exits cleanly
by erinn＠torproject.org 28 Aug '11

28 Aug '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/master] [Linux] Bump RelativeLink.sh copyright date
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 2044a3065b8fe8523cb632057764a2b03432a168 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 03:16:54 2011 -0400 [Linux] Bump RelativeLink.sh copyright date --- 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

[torbrowser/master] [Linux] Complain properly when both 'tor' and 'vidalia' are running
by erinn＠torproject.org 28 Aug '11

28 Aug '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/master] [2525 Linux] Handle being launched using a symlink
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 7bf12712a8aa2556fdb023c69bbf51d727a17b90 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 --- 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/master] [Linux] Be more strict about entering debug mode
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 76596fca6bfd65df9502832d53e5e0f75ef01f4b 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). --- 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