- tor-commits - lists.torproject.org

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

28 Aug '11

commit 0d007d4789ac142d5929529de3b1a0cf2082d385 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. (cherry picked from commit 52458db5b9a108d81c4869f10c4ee2bee4aeac18) --- 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] Make complain support kdialog
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 75410a2a4cdd80b9a6ec9592a339fc81e185b1e1 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). (cherry picked from commit ed5f99dc8ace80da6df532ebf257f4e807a92132) --- 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] Use $complain_dialog_title for generality
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 0ff817026165eafa966e83ea767124a44a792c13 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 03:50:53 2011 -0400 [Linux] Use $complain_dialog_title for generality (cherry picked from commit 0b1c288a7f7d41dcaeb76ee6cc14e10481d121c2) --- 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 28 Aug '11

28 Aug '11

commit 168936436404a98e9b1393a66626d619698e247c 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) (cherry picked from commit ccfb64406fb371b3e48377a2fb32ed45d3496107) --- 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] Add missing quotes (spotted by velope)
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit d6c37e52ee84f6f10870b87f2f445c5538871b0e Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Fri Aug 26 04:40:18 2011 -0400 [Linux] Add missing quotes (spotted by velope) (cherry picked from commit 7dc48b20ea1e4cb0783fb842fdd060b0c22f7ccb) --- 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 5461539..2c95fa3 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -118,10 +118,10 @@ 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 + echo "$usage_message" exit 1 elif [ "$#" -ne 0 ]; then - complain $usage_message + 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 28 Aug '11

28 Aug '11

commit f9638b4f6b97cb354222ef3d8f0469c6400ca8df 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) (cherry picked from commit 792b995928b7e107abb50c1dcd8659869f40ee93) --- 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

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

28 Aug '11

commit b2a16034094fa4940c3f98e5d495db360117f307 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. (cherry picked from commit a4c597d4f3bcdc931f6cbbdaa142d1b1997cddd9) --- 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] add missing linux 2.2.31-2 changelog entry
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit f8f22b1e5b401690a7021a1f7e9618a1a610c1e2 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:31:31 2011 +0100 add missing linux 2.2.31-2 changelog entry --- changelog.linux-2.2 | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index dfd7fb8..1d29228 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,4 +1,10 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=linux +Tor Browser Bundle (2.2.31-2) alpha; suite=linux + + * Fix x86_64 bundle to have the right libraries and binaries (closes: #3773) + + -- Erinn Clark <erinn(a)torproject.org> Mon Aug 22 23:47:27 CEST 2011 + +Tor Browser Bundle (2.2.31-1) alpha; suite=linux * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0

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

28 Aug '11

commit e3452cfec82d23f4a28fac5a8d5a4f0de636d623 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. (cherry picked from commit fa3a87a1837b30590f20918c41904e264816bd0e) --- 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/maint-2.2] [Linux] Exit successfully when run with the --help option
by erinn＠torproject.org 28 Aug '11

28 Aug '11

commit 5394b8fca9499711fe0d7c79054a536bfc24c447 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 (cherry picked from commit 71a997097d59f85d6a02a50e620092f92a684728) --- 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