summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe MacDonald <joe@deserted.net>2009-11-10 11:46:31 -0500
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-12 16:49:45 +0000
commit988e4ddf3cb129bc531b9234e2ab13c7f4c315ac (patch)
tree5e756d1f8bdb3fa2d3115c1fbc1012a51cef048b
parent117b91a1720076fd694fe3505b2eb6ff848851fb (diff)
downloadpoky-988e4ddf3cb129bc531b9234e2ab13c7f4c315ac.tar.gz
poky-988e4ddf3cb129bc531b9234e2ab13c7f4c315ac.tar.bz2
poky-988e4ddf3cb129bc531b9234e2ab13c7f4c315ac.zip
poky-init-build-env: Update for BASH 4 Bourne Shell semantics
It's no longer valid in bash 4 when invoked with Bourne Shell semantics to return unless you're inside a sourced script or a function. Doing so in this context doesn't actually exit from the setup script. This should probably preserve the original intent. Signed-off-by: Joe MacDonald <joe@deserted.net> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rwxr-xr-xpoky-init-build-env3
1 files changed, 2 insertions, 1 deletions
diff --git a/poky-init-build-env b/poky-init-build-env
index 2fce740790..9adff14f86 100755
--- a/poky-init-build-env
+++ b/poky-init-build-env
@@ -22,6 +22,7 @@
if test x"$0" = x"./poky-init-build-env"; then
echo "Error: Run via '. ./poky-init-build-env'"
return
+else
+ . ./scripts/poky-env-internal
fi
-. ./scripts/poky-env-internal