[tor-commits] [tor-messenger-build/master] Use Messenger/ as $HOME for start-tor-messenger

[sukhbir at torproject.org]

commit 6eae988888a4238cc19752548e839697ce7bea7e
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Thu Dec 18 16:39:57 2014 +0530

    Use Messenger/ as $HOME for start-tor-messenger
---
 projects/tor-messenger/start-tor-messenger |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/projects/tor-messenger/start-tor-messenger b/projects/tor-messenger/start-tor-messenger
index c94d816..7997832 100755
--- a/projects/tor-messenger/start-tor-messenger
+++ b/projects/tor-messenger/start-tor-messenger
@@ -205,7 +205,7 @@ if [ ! "${PWD}" ]; then
 	export HOME
 	surveysays="This system has a messed up shell.\n"
 else
-	HOME="${PWD}"
+	HOME="${PWD}/Messenger"
 	export HOME
 fi
 
@@ -217,7 +217,7 @@ if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then
    exit 1
 fi
 
-LD_LIBRARY_PATH="${HOME}/Messenger/lib/:${HOME}/Messenger/extensions/tor-launcher at torproject.org/TorBrowser/Tor:${HOME}/Messenger/extensions/ctypes-otr at tormessenger/chrome/content"
+LD_LIBRARY_PATH="${HOME}/lib/:${HOME}/extensions/tor-launcher at torproject.org/TorBrowser/Tor:${HOME}/extensions/ctypes-otr at tormessenger/chrome/content"
 export LD_LIBRARY_PATH
 
 function setControlPortPasswd() {
@@ -299,7 +299,7 @@ cd "${HOME}"
 # !!! Dash above comment! Now we pass command-line arguments we got (except --debug) to Firefox.
 # !!! Use at your own risk!
 # Adding --class for fixing bug 11102.
-TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./Messenger/instantbird "${@}"
+TOR_CONTROL_PASSWD=${TOR_CONTROL_PASSWD} ./instantbird "${@}"
 exitcode="$?"
 if [ "$exitcode" -ne 0 ]; then
 	complain "Tor Messenger exited abnormally.  Exit code: $exitcode"