[tor-commits] [torbrowser/maint-2.2] [Linux] Start TBB anyway when the launcher script is run with invalid args

[erinn at torproject.org]

commit e3452cfec82d23f4a28fac5a8d5a4f0de636d623
Author: Robert Ransom <rransom.8774 at 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