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

[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

[torbrowser/maint-2.2] [Linux] Don't specify -geometry when complaining using [g]xmessage
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit a4c597d4f3bcdc931f6cbbdaa142d1b1997cddd9 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:38:06 2011 -0400 [Linux] Don't specify -geometry when complaining using [g]xmessage velope reported that it could make the dialog too small to show the message text. --- 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 7df0983..5461539 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -87,7 +87,6 @@ complain () { -center \ -buttons OK \ -default OK \ - -geometry 300 \ -xrm '*message.scrollVertical: Never' \ "$complain_message" if [ "$?" -ne 127 ]; then @@ -103,7 +102,6 @@ complain () { -center \ -buttons GTK_STOCK_OK \ -default OK \ - -geometry 300 \ "$complain_message" if [ "$?" -ne 127 ]; then return

1 0

[torbrowser/maint-2.2] [Linux] Make complain support kdialog
by erinn＠torproject.org 23 Oct '11

23 Oct '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/maint-2.2] [Linux] Accept -debug instead of --debug in RelativeLink.sh
by erinn＠torproject.org 23 Oct '11

23 Oct '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/maint-2.2] [Linux] Correct bugs in RelativeLink.sh debug output (spotted by velope)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 792b995928b7e107abb50c1dcd8659869f40ee93 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:45:03 2011 -0400 [Linux] Correct bugs in RelativeLink.sh debug output (spotted by velope) --- src/RelativeLink/RelativeLink.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 2c95fa3..04d91fa 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -205,7 +205,7 @@ if [ "${debug}" ]; then 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" + printf "\nWe think this because of the following:\n${BOUND}\n" fi done @@ -227,5 +227,5 @@ if [ "$exitcode" -ne 0 ]; then complain "Vidalia exited abnormally. Exit code: $exitcode" exit "$exitcode" else - echo '\nVidalia exited cleanly.\n' + printf '\nVidalia exited cleanly.\n' fi

1 0