[tor-commits] [tor-browser-bundle/master] Bug #10049: Fix architecture check to work from outside TBB's directory.

[mikeperry at torproject.org]

commit 056dd50cf89fa2482c65f00f235a54493fbc3e6f
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Nov 14 02:16:09 2013 -0800

    Bug #10049: Fix architecture check to work from outside TBB's directory.
    
    Patch by Moritz Bartl.
---
 RelativeLink/RelativeLink.sh |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh
index 6a4d05e..b2255f6 100755
--- a/RelativeLink/RelativeLink.sh
+++ b/RelativeLink/RelativeLink.sh
@@ -116,14 +116,6 @@ if [ "`id -u`" -eq 0 ]; then
 	exit 1
 fi
 
-SYSARCHITECTURE=$(getconf LONG_BIT)
-TORARCHITECTURE=$(expr "$(file Tor/tor)" : '.*ELF \([[:digit:]]*\)')
-
-if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then
-   complain "Wrong architecture? 32-bit vs. 64-bit."
-   exit 1
-fi
-
 debug=0
 usage_message="usage: $0 [--debug]"
 if [ "$#" -eq 1 -a \( "x$1" = "x--debug" -o "x$1" = "x-debug" \) ]; then
@@ -206,6 +198,14 @@ else
 	export HOME
 fi
 
+SYSARCHITECTURE=$(getconf LONG_BIT)
+TORARCHITECTURE=$(expr "$(file Tor/tor)" : '.*ELF \([[:digit:]]*\)')
+
+if [ $SYSARCHITECTURE -ne $TORARCHITECTURE ]; then
+   complain "Wrong architecture? 32-bit vs. 64-bit."
+   exit 1
+fi
+
 LDPATH="${HOME}/Tor/"
 export LDPATH