edksetup.sh: Fix typo and return code

The typo was a check for the string "BaseTool" instead of "BaseTools".

Also fixed the issue where the script returned success even when
configuration failed.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15200 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Leif Lindholm 2014-01-30 19:26:53 +00:00 committed by jljusten
parent ef9086c3a5
commit 1bb6bfaa08
1 changed files with 8 additions and 4 deletions

View File

@ -30,6 +30,7 @@ function HelpMsg()
echo Please note: This script must be \'sourced\' so the environment can be changed. echo Please note: This script must be \'sourced\' so the environment can be changed.
echo ". edksetup.sh" echo ". edksetup.sh"
echo "source edksetup.sh" echo "source edksetup.sh"
return 1
} }
function SetupEnv() function SetupEnv()
@ -51,7 +52,6 @@ function SourceEnv()
] ]
then then
HelpMsg HelpMsg
return
else else
SetupEnv "$*" SetupEnv "$*"
fi fi
@ -60,11 +60,15 @@ function SourceEnv()
if [ $# -gt 1 ] if [ $# -gt 1 ]
then then
HelpMsg HelpMsg
return elif [ $# -eq 1 ] && [ "$1" != "BaseTools" ]
elif [ $# -eq 1 ] && [ "$1" != "BaseTool" ]
then then
HelpMsg HelpMsg
return fi
RETVAL=$?
if [ $RETVAL -ne 0 ]
then
return $RETVAL
fi fi
SourceEnv "$*" SourceEnv "$*"