Add sanity check to setenv-*.sh scripts

Prompt user to source the script when required. Whitespace check-in

1 files changed, 31 insertions, 26 deletions

diff --git a/TestScripts/setenv-ios.sh b/TestScripts/setenv-ios.sh
index efd6a8b5..577ad055 100755
--- a/TestScripts/setenv-ios.sh
+++ b/TestScripts/setenv-ios.sh
@@ -13,6 +13,11 @@
 
 # set -eu
 
+# Sanity check
+if [ "$0" != "${BASH_SOURCE[0]}" ]; then
+    echo "Please source this setenv script"
+fi
+
 #########################################
 #####       Clear old options       #####
 #########################################
@@ -131,12 +136,12 @@ done
 # Defaults if not set
 if [ -z "$APPLE_SDK" ]; then
     BACK_ARCH=armv7
-	APPLE_SDK=iPhoneOS
+    APPLE_SDK=iPhoneOS
 fi
 
 # Defaults if not set
 if [ -z "$IOS_ARCH" ]; then
-	IOS_ARCH="$BACK_ARCH"
+    IOS_ARCH="$BACK_ARCH"
 fi
 
 # Allow a user override? I think we should be doing this. The use case is:
@@ -149,7 +154,7 @@ fi
 
 if [ ! -d "$XCODE_DEVELOPER" ]; then
   echo "ERROR: unable to find XCODE_DEVELOPER directory."
-  [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
+  [ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1
 fi
 
 # Default toolchain location
@@ -157,7 +162,7 @@ XCODE_TOOLCHAIN="$XCODE_DEVELOPER/usr/bin"
 
 if [ ! -d "$XCODE_TOOLCHAIN" ]; then
   echo "ERROR: unable to find XCODE_TOOLCHAIN directory."
-  [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
+  [ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1
 fi
 
 # XCODE_DEVELOPER_TOP is the top of the development tools tree
@@ -165,7 +170,7 @@ XCODE_DEVELOPER_TOP="$XCODE_DEVELOPER/Platforms/$APPLE_SDK.platform/Developer"
 
 if [ ! -d "$XCODE_DEVELOPER_TOP" ]; then
   echo "ERROR: unable to find XCODE_DEVELOPER_TOP directory."
-  [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
+  [ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1
 fi
 
 # IOS_TOOLCHAIN is the location of the actual compiler tools.
@@ -177,7 +182,7 @@ fi
 
 if [ -z "$IOS_TOOLCHAIN" ] || [ ! -d "$IOS_TOOLCHAIN" ]; then
   echo "ERROR: unable to find Xcode cross-compiler tools."
-  [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
+  [ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1
 fi
 
 #
@@ -187,16 +192,16 @@ fi
 unset XCODE_SDK
 for i in $(seq -f "%.1f" 20.0 -0.1 1.0)
 do
-	if [ -d "$XCODE_DEVELOPER/Platforms/$APPLE_SDK.platform/Developer/SDKs/$APPLE_SDK$i.sdk" ]; then
-    	XCODE_SDK="$APPLE_SDK$i.sdk"
-      	break
-	fi
+    if [ -d "$XCODE_DEVELOPER/Platforms/$APPLE_SDK.platform/Developer/SDKs/$APPLE_SDK$i.sdk" ]; then
+        XCODE_SDK="$APPLE_SDK$i.sdk"
+          break
+    fi
 done
 
 # Error checking
 if [ -z "$XCODE_SDK" ]; then
     echo "ERROR: unable to find a SDK."
-    [ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
+    [ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1
 fi
 
 # https://github.com/weidai11/cryptopp/issues/635
@@ -276,16 +281,16 @@ fi
 # Only modify/export PATH if IOS_TOOLCHAIN good
 if [ ! -z "$IOS_TOOLCHAIN" ] && [ ! -z "$XCODE_TOOLCHAIN" ]; then
 
-	# And only modify PATH if IOS_TOOLCHAIN is not present
-	TOOL_PATH="$IOS_TOOLCHAIN:$XCODE_TOOLCHAIN"
-	LEN=${#TOOL_PATH}
-	SUBSTR=${PATH:0:$LEN}
-	if [ "$SUBSTR" != "$TOOL_PATH" ]; then
-		export PATH="$TOOL_PATH":"$PATH"
-	fi
+    # And only modify PATH if IOS_TOOLCHAIN is not present
+    TOOL_PATH="$IOS_TOOLCHAIN:$XCODE_TOOLCHAIN"
+    LEN=${#TOOL_PATH}
+    SUBSTR=${PATH:0:$LEN}
+    if [ "$SUBSTR" != "$TOOL_PATH" ]; then
+        export PATH="$TOOL_PATH":"$PATH"
+    fi
 else
-	echo "ERROR: unable to set new PATH."
-	[ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
+    echo "ERROR: unable to set new PATH."
+    [ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1
 fi
 
 ########################################
@@ -300,14 +305,14 @@ FOUND_ALL=1
 TOOLS=(clang clang++ libtool ld)
 for tool in ${TOOLS[@]}
 do
-	if [ ! -e "$IOS_TOOLCHAIN/$tool" ] && [ ! -e "$XCODE_TOOLCHAIN/$tool" ]; then
-		echo "ERROR: unable to find $tool at IOS_TOOLCHAIN or XCODE_TOOLCHAIN"
-		FOUND_ALL=0
-	fi
+    if [ ! -e "$IOS_TOOLCHAIN/$tool" ] && [ ! -e "$XCODE_TOOLCHAIN/$tool" ]; then
+        echo "ERROR: unable to find $tool at IOS_TOOLCHAIN or XCODE_TOOLCHAIN"
+        FOUND_ALL=0
+    fi
 done
 
 if [ "$FOUND_ALL" -eq "0" ]; then
-	[ "$0" = "$BASH_SOURCE" ] && exit 1 || return 1
+    [ "$0" = "${BASH_SOURCE[0]}" ] && exit 1 || return 1
 fi
 
 # Exports added for Autotools. GNUmakefile-cross does not use them.
@@ -329,4 +334,4 @@ echo "shared object using 'HAS_SOLIB_VERSION=1 make -f GNUmakefile-cross'"
 echo "*******************************************************************************"
 echo
 
-[ "$0" = "$BASH_SOURCE" ] && exit 0 || return 0
+[ "$0" = "${BASH_SOURCE[0]}" ] && exit 0 || return 0