diff options
| author | Charles Duffy <chaduffy@cisco.com> | 2016-01-20 05:12:02 +0000 |
|---|---|---|
| committer | yzhu52 <yzhu52@Edk2> | 2016-01-20 05:12:02 +0000 |
| commit | 5e407648358d639ed19d228303527133e4c95c25 (patch) | |
| tree | 168ba8b12e04baed6e0c878b58d2f6f99c97a393 /BaseTools/BinWrappers/PosixLike/EfiRom | |
| parent | 6928c1d3eed8fb3ab0b136f0ebdcef50f7bda2f3 (diff) | |
| download | edk2-platforms-5e407648358d639ed19d228303527133e4c95c25.tar.xz | |
BaseTools: Improve shell wrapper for C build commands
- Avoid obsolescent forms of test builtin (`-a` and `-o`; see APPLICATION USAGE
section of http://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html).
- Quote all expansions to prevent string-splitting and globbing.
- Avoid unspecified "exit -1" (only single-byte integers are valid); instead,
use identical exit status to shell command-not-found.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Charles Duffy <chaduffy@cisco.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19695 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools/BinWrappers/PosixLike/EfiRom')
| -rwxr-xr-x | BaseTools/BinWrappers/PosixLike/EfiRom | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/BaseTools/BinWrappers/PosixLike/EfiRom b/BaseTools/BinWrappers/PosixLike/EfiRom index 4821d24fa7..0945d86d92 100755 --- a/BaseTools/BinWrappers/PosixLike/EfiRom +++ b/BaseTools/BinWrappers/PosixLike/EfiRom @@ -1,29 +1,29 @@ #!/usr/bin/env bash -#python `dirname $0`/RunToolFromSource.py `basename $0` $* -#exec `dirname $0`/../../../../C/bin/`basename $0` $* -TOOL_BASENAME=`basename $0` +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here +dir=$(dirname "$full_cmd") +cmd=${full_cmd##*/} -if [ -n "$WORKSPACE" -a -e $WORKSPACE/Conf/BaseToolsCBinaries ] +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ] then - exec $WORKSPACE/Conf/BaseToolsCBinaries/$TOOL_BASENAME -elif [ -n "$WORKSPACE" -a -e $EDK_TOOLS_PATH/Source/C ] + exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd" +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ] then - if [ ! -e $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME ] + if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ] then - echo BaseTools C Tool binary was not found \($TOOL_BASENAME\) - echo You may need to run: + echo "BaseTools C Tool binary was not found ($cmd)" + echo "You may need to run:" echo " make -C $EDK_TOOLS_PATH/Source/C" else - exec $EDK_TOOLS_PATH/Source/C/bin/$TOOL_BASENAME $* + exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@" fi -elif [ -e `dirname $0`/../../Source/C/bin/$TOOL_BASENAME ] +elif [ -e "$dir/../../Source/C/bin/$cmd" ] then - exec `dirname $0`/../../Source/C/bin/$TOOL_BASENAME $* + exec "$dir/../../Source/C/bin/$cmd" "$@" else - echo Unable to find the real \'$TOOL_BASENAME\' to run - echo This message was printed by + echo "Unable to find the real '$cmd' to run" + echo "This message was printed by" echo " $0" - exit -1 + exit 127 fi |