[tor-commits] [tor-messenger-build/master] Finalize the start-tor-messenger script (based on TBB equivalent)

sukhbir at torproject.org sukhbir at torproject.org
Tue Jul 14 04:26:28 UTC 2015


commit 802e9df30c9d49b07442eca7b511e8bf7d358bd1
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Tue Jul 14 00:26:22 2015 -0400

    Finalize the start-tor-messenger script (based on TBB equivalent)
---
 projects/tor-messenger/start-tor-messenger |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/projects/tor-messenger/start-tor-messenger b/projects/tor-messenger/start-tor-messenger
index 6f1131e..6c85733 100755
--- a/projects/tor-messenger/start-tor-messenger
+++ b/projects/tor-messenger/start-tor-messenger
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 #
+# This script is modified from the start-tor-browser script.
+#
 # GNU/Linux does not really require something like RelativeLink.c
 # However, we do want to have the same look and feel with similar features.
 #
@@ -98,8 +100,8 @@ fi
 
 tbb_usage () {
     printf "\nTor Messenger Script Options\n"
-    printf "  --verbose         Display Tor and Firefox output in the terminal\n"
-    printf "  --log [file]      Record Tor and Firefox output in file (default: tor-messenger.log)\n"
+    printf "  --verbose         Display Tor and Instantbird output in the terminal\n"
+    printf "  --log [file]      Record Tor and Instantbird output in file (default: tor-messenger.log)\n"
     printf "  --detach          Detach from terminal and run Tor Messenger in the background.\n"
     printf "  --register-app    Register Tor Messenger as a desktop app for this user\n"
     printf "  --unregister-app  Unregister Tor Messenger as a desktop app for this user\n"
@@ -166,7 +168,7 @@ fi
 
 if [ "$show_output" -eq 0 ]; then
     # If the user hasn't requested 'debug mode' or --help, close stdout and stderr,
-    # to keep Firefox and the stuff loaded by/for it (including the
+    # to keep Instantbird and the stuff loaded by/for it (including the
     # system's shared-library loader) from printing messages to
     # $HOME/.xsession-errors or other files. (Users wouldn't have seen
     # messages there anyway.)
@@ -342,12 +344,12 @@ setControlPortPasswd ${TOR_CONTROL_PASSWD:='"secret"'}
 
 cd "${HOME}"
 
-# We pass all additional command-line arguments we get to Firefox.
+# We pass all additional command-line arguments we get to Instantbird.
 #
 # The --class parameter was added to fix bug 11102.
 
 if [ "$show_usage" -eq 1 ]; then
-    # Display Firefox help, then our help
+    # Display Instantbird help, then our help
     TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird --class "Tor Messenger" \
         -profile TorMessenger/Data/Browser/profile.default --help 2>/dev/null
     tbb_usage



More information about the tor-commits mailing list