From 5f17b4e6d39b80bfdef64c2f154869d77eaa9c19 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 10 Nov 2016 02:41:23 -0500 Subject: [PATCH] Add checks for unbound variables --- bds10.zip | Bin 6812 -> 0 bytes setenv-android.sh | 10 ++++++---- setenv-embedded.sh | 4 +++- setenv-ios.sh | 11 ++++++++--- 4 files changed, 17 insertions(+), 8 deletions(-) delete mode 100644 bds10.zip diff --git a/bds10.zip b/bds10.zip deleted file mode 100644 index 50fe7cd2dec51655f2ea2cca7f60a21b5657abb0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6812 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 IqkqEw3to_icK`qY diff --git a/setenv-android.sh b/setenv-android.sh index f0a5e8fb..a329786b 100755 --- a/setenv-android.sh +++ b/setenv-android.sh @@ -11,6 +11,8 @@ # See http://www.cryptopp.com/wiki/Android_(Command_Line) for more details # ==================================================================== +set -eu + unset IS_CROSS_COMPILE unset IS_IOS @@ -32,7 +34,7 @@ unset ANDROID_STL_INC ANDROID_STL_LIB unset CPP CC CXX LD AS AR RANLIB STRIP # Similar to a "make clean" -if [ "$1" = "unset" ]; then +if [ x"${1-}" = "xunset" ]; then echo "Unsetting script variables. PATH may remain tainted" [ "$0" = "$BASH_SOURCE" ] && exit 0 || return 0 fi @@ -41,7 +43,7 @@ fi # Note: 4.9 is required for the latest architectures, like ARM64/AARCH64. # AOSP_TOOLCHAIN_SUFFIX=4.8 # AOSP_TOOLCHAIN_SUFFIX=4.9 -if [ -z "$AOSP_TOOLCHAIN_SUFFIX" ]; then +if [ -z "${AOSP_TOOLCHAIN_SUFFIX-}" ]; then AOSP_TOOLCHAIN_SUFFIX=4.9 fi @@ -57,7 +59,7 @@ fi # AOSP_API="android-19" # Android 4.4 and above # AOSP_API="android-21" # Android 5.0 and above # AOSP_API="android-23" # Android 6.0 and above -if [ -z "$AOSP_API" ]; then +if [ -z "${AOSP_API-}" ]; then AOSP_API="android-21" fi @@ -68,7 +70,7 @@ fi # If the user did not specify the NDK location, try and pick it up. We expect something # like ANDROID_NDK_ROOT=/opt/android-ndk-r10e or ANDROID_NDK_ROOT=/usr/local/android-ndk-r10e. -if [ -z "$ANDROID_NDK_ROOT" ]; then +if [ -z "${ANDROID_NDK_ROOT-}" ]; then ANDROID_NDK_ROOT=$(find /opt -maxdepth 1 -type d -name android-ndk-r10* 2>/dev/null | tail -1) if [ -z "$ANDROID_NDK_ROOT" ]; then diff --git a/setenv-embedded.sh b/setenv-embedded.sh index a6caf9ae..c6259645 100755 --- a/setenv-embedded.sh +++ b/setenv-embedded.sh @@ -13,6 +13,8 @@ # See http://www.cryptopp.com/wiki/ARM_Embedded_(Command_Line) for details. # ==================================================================== +set -eu + # Unset old options unset IS_CROSS_COMPILE @@ -21,7 +23,7 @@ unset IS_IOS unset IS_ANDROID unset IS_ARM_EMBEDDED -if [ -z "$ARM_EMBEDDED_TOOLCHAIN" ]; then +if [ -z "${ARM_EMBEDDED_TOOLCHAIN-}" ]; then ARM_EMBEDDED_TOOLCHAIN="/usr/bin" fi diff --git a/setenv-ios.sh b/setenv-ios.sh index 929f3b59..597a1528 100755 --- a/setenv-ios.sh +++ b/setenv-ios.sh @@ -11,6 +11,8 @@ # See http://www.cryptopp.com/wiki/iOS_(Command_Line) for more details # ==================================================================== +set -eu + ######################################### ##### Clear old options ##### ######################################### @@ -38,6 +40,9 @@ SETENV_VERBOSE=1 ##### Command line ##### ######################################## +APPLE_SDK= +IOS_ARCH= + for ARG in "$@" do CL=$(echo $ARG | tr '[A-Z]' '[a-z]') @@ -132,7 +137,7 @@ fi # move /Applications/Xcode somewhere else for a side-by-side installation. # These sorts of tricks are a required procedure on Apple's gear: # http://stackoverflow.com/questions/11651773/install-simulator-sdk-4-3-to-xcode-4-4-on-mountain-lion -if [ -z "$XCODE_DEVELOPER" ]; then +if [ -z "${XCODE_DEVELOPER-}" ]; then XCODE_DEVELOPER=$(xcode-select -print-path 2>/dev/null) fi @@ -233,8 +238,8 @@ if [ "$SETENV_VERBOSE" == "1" ]; then echo "XCODE_DEVELOPER_TOP: $XCODE_DEVELOPER_TOP" echo "IOS_ARCH: $IOS_ARCH" echo "IOS_TOOLCHAIN: $IOS_TOOLCHAIN" - echo "IOS_FLAGS: $IOS_FLAGS" - echo "IOS_SYSROOT: $IOS_SYSROOT" + echo "IOS_FLAGS: ${IOS_FLAGS-}" + echo "IOS_SYSROOT: ${IOS_SYSROOT-}" fi ########################################