- tor-commits - lists.torproject.org

[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

[torbrowser/master] [Linux] Make complain support kdialog
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit ed5f99dc8ace80da6df532ebf257f4e807a92132 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 01:03:10 2011 -0400 [Linux] Make complain support kdialog Note that the version of kdialog in debian-live-6.0.1-i386-kde-desktop.iso does not set the window size properly for five or more lines of text. We may or may not run into that bug in this script, but there's nothing we can do about it (except possibly report it upstream). --- src/RelativeLink/RelativeLink.sh | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 08165c3..8013f38 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -70,6 +70,12 @@ complain () { return fi + # Try kdialog. + kdialog --title "$complain_dialog_title" --error "$1" + if [ "$?" -ne 127 ]; then + return + fi + # Try xmessage. xmessage -title "$complain_dialog_title" \ -center \

1 0

[torbrowser/master] [Linux] Accept -debug instead of --debug in RelativeLink.sh
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 52458db5b9a108d81c4869f10c4ee2bee4aeac18 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Aug 25 23:11:27 2011 -0400 [Linux] Accept -debug instead of --debug in RelativeLink.sh Suggested by velope. --- src/RelativeLink/RelativeLink.sh | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 2894ed7..08165c3 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -103,11 +103,15 @@ if [ "`id -u`" -eq 0 ]; then exit 1 fi -if [ "$#" -eq 1 -a "x$1" = "x--debug" ]; then +usage_message="usage: $0 [--debug]" +if [ "$#" -eq 1 -a $ "x$1" = "x--debug" -o "x$1" = "x-debug" $ ]; then debug=1 printf "\nDebug enabled.\n\n" +elif [ "$#" -eq 1 -a $ "x$1" = "x--help" -o "x$1" = "x-help" $ ]; then + echo $usage_message + exit 1 elif [ "$#" -ne 0 ]; then - complain "usage: $0 [--debug]" + complain $usage_message exit 1 fi

1 0

[torbrowser/master] [Linux] Add UI improvements to complain suggested by velope
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit a8243193ec3930329fa6e3928a2b2a8a42eafff1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Thu Aug 25 23:09:20 2011 -0400 [Linux] Add UI improvements to complain suggested by velope --- src/RelativeLink/RelativeLink.sh | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 462ca98..2894ed7 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -7,6 +7,8 @@ # # Copyright 2011 The Tor Project. See LICENSE for licensing information. +complain_dialog_title="Tor Browser Bundle" + # First, make sure DISPLAY is set. If it isn't, we're hosed; scream # at stderr and die. if [ "x$DISPLAY" = "x" ]; then @@ -63,13 +65,19 @@ complain () { # it returns non-zero.) # First, try zenity. - zenity --error --text="$1" + zenity --error --title="$complain_dialog_title" --text="$1" if [ "$?" -ne 127 ]; then return fi # Try xmessage. - xmessage "$1" + xmessage -title "$complain_dialog_title" \ + -center \ + -buttons OK \ + -default OK \ + -geometry 300 \ + -xrm '*message.scrollVertical: Never' \ + "$1" if [ "$?" -ne 127 ]; then return fi @@ -79,7 +87,12 @@ complain () { # be the least likely program to have available, but it might # be used by one of the 'lightweight' Gtk-based desktop # environments. - gxmessage "$1" + gxmessage -title "$complain_dialog_title" \ + -center \ + -buttons GTK_STOCK_OK \ + -default OK \ + -geometry 300 \ + "$1" if [ "$?" -ne 127 ]; then return fi

1 0