From: Joe MacDonald <joe@deserted.net>
Date: Tue, 10 Nov 2009 16:46:31 +0000 (-0500)
Subject: poky-init-build-env: Update for BASH 4 Bourne Shell semantics
X-Git-Tag: 2011-1~6881
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=988e4ddf3cb129bc531b9234e2ab13c7f4c315ac;p=openembedded-core.git

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>
---

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