]> code.ossystems Code Review - openembedded-core.git/commitdiff
poky-init-build-env: Update for BASH 4 Bourne Shell semantics
authorJoe MacDonald <joe@deserted.net>
Tue, 10 Nov 2009 16:46:31 +0000 (11:46 -0500)
committerRichard Purdie <rpurdie@linux.intel.com>
Thu, 12 Nov 2009 16:49:45 +0000 (16:49 +0000)
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>
poky-init-build-env

index 2fce740790e4fd286aee4b55e116a26939f353f8..9adff14f8611318a3b3134fda80c8482bb91b4e1 100755 (executable)
@@ -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