- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] [Linux] Quote some shell expansion results
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit d9c40aa4f2a4e5bf62a6420a514e8f0b1e7a05ca Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 02:05:20 2011 -0400 [Linux] Quote some shell expansion results At the very least, `pwd` and $HOME need to be enclosed in double quotes (so that spaces in directory names won't automatically break things). --- src/RelativeLink/RelativeLink.sh | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 63c0414..e33b1a8 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -7,8 +7,8 @@ # # Copyright 2010 The Tor Project. See LICENSE for licensing information. -if [ $1 ]; then - debug=$1 +if [ "$1" ]; then + debug="$1" printf "\nDebug enabled.\n\n" fi @@ -28,7 +28,7 @@ test -d "$mydir" && cd "$mydir" # If ${PWD} results in a zero length HOME, we can try something else... if [ ! "${PWD}" ]; then # "hacking around some braindamage" - HOME=`pwd` + HOME="`pwd`" export HOME surveysays="This system has a messed up shell.\n" else @@ -37,12 +37,12 @@ else fi if ldd ./App/Firefox/firefox-bin | grep -q "libz\.so\.1.*not found"; then - LD_LIBRARY_PATH=${HOME}/Lib:${HOME}/Lib/libz + LD_LIBRARY_PATH="${HOME}/Lib:${HOME}/Lib/libz" else - LD_LIBRARY_PATH=${HOME}/Lib + LD_LIBRARY_PATH="${HOME}/Lib" fi -LDPATH=${HOME}/Lib/ +LDPATH="${HOME}/Lib/" export LDPATH export LD_LIBRARY_PATH DYLD_PRINT_LIBRARIES=1 @@ -51,7 +51,7 @@ export DYLD_PRINT_LIBRARIES # if any relevant processes are running, inform the user and exit cleanly RUNNING=0 for process in tor vidalia - do pid=`pidof $process` + do pid="`pidof $process`" if [ -n "$pid" ]; then printf "\n$process is already running as PID $pid\n\n" RUNNING=1 @@ -72,7 +72,7 @@ if [ "${debug}" ]; then # this is likely unportable to Mac OS X or other netstat binaries for port in "8118" "9050" do - BOUND=`netstat -tan 2>&1|grep 127.0.0.1":${port}[^:]"|grep -v TIME_WAIT` + BOUND="`netstat -tan 2>&1|grep 127.0.0.1":${port}[^:]"|grep -v TIME_WAIT`" if [ "${BOUND}" ]; then printf "\nLikely problem detected: It appears that you have something listening on ${port}\n" printf "\nWe think this because of the following: ${BOUND}\n"

1 0

[torbrowser/maint-2.2] [2824 Linux] Explicitly refuse to run TBB-Linux as root
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 063c2f62567282c0c3093f35b414ee52ff87aee4 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 02:09:08 2011 -0400 [2824 Linux] Explicitly refuse to run TBB-Linux as root --- src/RelativeLink/RelativeLink.sh | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index e33b1a8..fe00dcd 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -7,6 +7,11 @@ # # Copyright 2010 The Tor Project. See LICENSE for licensing information. +if [ "`id -u`" -eq 0 ]; then + echo "The Tor Browser Bundle should not be run as root. Exiting." + exit 1 +fi + if [ "$1" ]; then debug="$1" printf "\nDebug enabled.\n\n"

1 0

[torbrowser/maint-2.2] [Linux] Remove a bogus comment
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 630326fad2c3321557c438a6ac8c8aeb9e8224e0 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Aug 23 01:58:56 2011 -0400 [Linux] Remove a bogus comment The commonly used Linux desktop environments' file managers do not allow C programs to have custom icons. --- src/RelativeLink/RelativeLink.sh | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 09013a9..63c0414 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -2,8 +2,6 @@ # # GNU/Linux does not really require something like RelativeLink.c # However, we do want to have the same look and feel with similiar features. -# In the future, we may want this to be a C binary with a custom icon but at the moment -# it's quite simple to just use a shell script # # To run in debug mode simply pass --debug #

1 0

[torbrowser/maint-2.2] [2525 Linux] Handle being launched using a symlink
by erinn＠torproject.org 23 Oct '11

23 Oct '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/maint-2.2] [Linux] Be more strict about entering debug mode
by erinn＠torproject.org 23 Oct '11

23 Oct '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/maint-2.2] [Linux] Use ` ` instead of $( ) for consistency
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 756d8db1ecadd09a8d8f947187ef31e8c40ff912 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Wed Aug 24 03:21:10 2011 -0400 [Linux] Use ` ` instead of $( ) for consistency --- 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 23 Oct '11

23 Oct '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/maint-2.2] [Linux] Add UI improvements to complain suggested by velope
by erinn＠torproject.org 23 Oct '11

23 Oct '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

[torbrowser/maint-2.2] [Linux] Use $complain_dialog_title for generality
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 0b1c288a7f7d41dcaeb76ee6cc14e10481d121c2 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 03:50:53 2011 -0400 [Linux] Use $complain_dialog_title for generality --- 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 8013f38..a1a1510 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -12,7 +12,7 @@ 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 - echo "The Tor Browser Bundle for Linux must be run within the X Window System." >&2 + echo "$complain_dialog_title must be run within the X Window System." >&2 echo "Exiting." >&2 exit 1 fi

1 0

[torbrowser/maint-2.2] [Linux] Trim leading newlines in complain messages (patch by velope)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit ccfb64406fb371b3e48377a2fb32ed45d3496107 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:23:50 2011 -0400 [Linux] Trim leading newlines in complain messages (patch by velope) --- 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 a1a1510..7df0983 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -47,9 +47,12 @@ fi # Usage: complain message # message must not begin with a dash. complain () { + # Trim leading newlines, to avoid breaking formatting in some dialogs. + complain_message="`echo "$1" | sed '/./,$!d'`" + # If we're being run in a terminal, complain there. if [ "$ARE_WE_RUNNING_IN_A_TERMINAL" -ne 0 ]; then - echo "$1" >&2 + echo "$complain_message" >&2 return fi @@ -65,13 +68,16 @@ complain () { # it returns non-zero.) # First, try zenity. - zenity --error --title="$complain_dialog_title" --text="$1" + zenity --error \ + --title="$complain_dialog_title" \ + --text="$complain_message" if [ "$?" -ne 127 ]; then return fi # Try kdialog. - kdialog --title "$complain_dialog_title" --error "$1" + kdialog --title "$complain_dialog_title" \ + --error "$complain_message" if [ "$?" -ne 127 ]; then return fi @@ -83,7 +89,7 @@ complain () { -default OK \ -geometry 300 \ -xrm '*message.scrollVertical: Never' \ - "$1" + "$complain_message" if [ "$?" -ne 127 ]; then return fi @@ -98,7 +104,7 @@ complain () { -buttons GTK_STOCK_OK \ -default OK \ -geometry 300 \ - "$1" + "$complain_message" if [ "$?" -ne 127 ]; then return fi

1 0