diff options
| -rwxr-xr-x | extract-files.sh | 8 | ||||
| -rwxr-xr-x | setup-makefiles.sh | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/extract-files.sh b/extract-files.sh index 33d188c..88a8de0 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -16,6 +16,12 @@ # limitations under the License. # +# If we're being sourced by the common script that we called, +# stop right here. No need to go down the rabbit hole. +if [ "${BASH_SOURCE[0]}" != "${0}" ]; then + return +fi + set -e # Required! @@ -25,4 +31,4 @@ export VENDOR=zuk export DEVICE_BRINGUP_YEAR=2016 -./../../$VENDOR/$DEVICE_COMMON/extract-files.sh "$@" +source "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@" diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 91024bf..9d6bcb5 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -25,4 +25,4 @@ export VENDOR=zuk export DEVICE_BRINGUP_YEAR=2016 -./../../$VENDOR/$DEVICE_COMMON/setup-makefiles.sh $@ +source "./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@" |