diff options
| author | Leif Lindholm <leif.lindholm@linaro.org> | 2014-01-30 19:26:53 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-01-30 19:26:53 +0000 |
| commit | 1bb6bfaa082be625512297a3250be58e2f999341 (patch) | |
| tree | 1e381507fd8bb78a76f2bf1874dfb2f960bf2f30 | |
| parent | ef9086c3a52572fbd7f9c16e57093086224ce914 (diff) | |
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
| -rwxr-xr-x | edksetup.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/edksetup.sh b/edksetup.sh index 7285dfe8d..0b7e33fd7 100755 --- a/edksetup.sh +++ b/edksetup.sh @@ -30,6 +30,7 @@ function HelpMsg() echo Please note: This script must be \'sourced\' so the environment can be changed. echo ". edksetup.sh" echo "source edksetup.sh" + return 1 } function SetupEnv() @@ -51,7 +52,6 @@ function SourceEnv() ] then HelpMsg - return else SetupEnv "$*" fi @@ -60,11 +60,15 @@ function SourceEnv() if [ $# -gt 1 ] then HelpMsg - return -elif [ $# -eq 1 ] && [ "$1" != "BaseTool" ] +elif [ $# -eq 1 ] && [ "$1" != "BaseTools" ] then HelpMsg - return +fi + +RETVAL=$? +if [ $RETVAL -ne 0 ] +then + return $RETVAL fi SourceEnv "$*" |