From: rebecca@bsdio.com
To: devel@edk2.groups.io, Jordan Justen <jordan.l.justen@intel.com>,
Laszlo Ersek <lersek@redhat.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Rebecca Cran <rebecca@bsdio.com>
Subject: [PATCH v2 1/3] OvmfPkg/build.sh: use POSIX 'command -v' instead of 'which'.
Date: Wed, 24 Jul 2019 15:44:03 -0600 [thread overview]
Message-ID: <20190724214405.16162-1-rebecca@bsdio.com> (raw)
Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
OvmfPkg/build.sh | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/OvmfPkg/build.sh b/OvmfPkg/build.sh
index e94aa2a37e..1c28e65404 100755
--- a/OvmfPkg/build.sh
+++ b/OvmfPkg/build.sh
@@ -174,11 +174,11 @@ case $PROCESSOR in
# The user set the QEMU_COMMAND variable. We'll use it to run QEMU.
#
:
- elif [ -x `which qemu-system-i386` ]; then
+ elif command -v qemu-system-i386; then
QEMU_COMMAND=qemu-system-i386
- elif [ -x `which qemu-system-x86_64` ]; then
+ elif command -v qemu-system-x86_64; then
QEMU_COMMAND=qemu-system-x86_64
- elif [ -x `which qemu` ]; then
+ elif command -v qemu; then
QEMU_COMMAND=qemu
else
echo Unable to find QEMU for IA32 architecture!
@@ -242,12 +242,12 @@ FV_DIR=$BUILD_ROOT/FV
BUILD_ROOT_ARCH=$BUILD_ROOT/$BUILD_ROOT_ARCH
QEMU_FIRMWARE_DIR=$BUILD_ROOT/QEMU
-if [[ ! -f `which build` || ! -f `which GenFv` ]];
+if ! command -v build || ! command -v GenFv;
then
# build the tools if they don't yet exist. Bin scheme
echo Building tools as they are not in the path
make -C $WORKSPACE/BaseTools
-elif [[ ( -f `which build` || -f `which GenFv` ) && ! -d $EDK_TOOLS_PATH/Source/C/bin ]];
+elif [[ ( $(command -v build) || $(command -v GenFv) ) && ! -d $EDK_TOOLS_PATH/Source/C/bin ]];
then
# build the tools if they don't yet exist. BinWrapper scheme
echo Building tools no $EDK_TOOLS_PATH/Source/C/bin directory
--
2.22.0
next reply other threads:[~2019-07-24 21:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-24 21:44 rebecca [this message]
2019-07-24 21:44 ` [PATCH v2 2/3] OvmfPkg/build.sh: use newer '-drive if=pflash' syntax when running qemu rebecca
2019-07-25 2:56 ` Jordan Justen
2019-07-25 11:07 ` [edk2-devel] " Philippe Mathieu-Daudé
2019-07-24 21:44 ` [PATCH v2 3/3] OvmfPkg/build.sh: remove $ADD_QEMU_HDA rebecca
2019-07-24 22:56 ` Jordan Justen
2019-07-30 2:24 ` [edk2-devel] " rebecca
2019-07-30 5:53 ` Jordan Justen
2019-07-25 11:08 ` Philippe Mathieu-Daudé
2019-07-25 11:07 ` [edk2-devel] [PATCH v2 1/3] OvmfPkg/build.sh: use POSIX 'command -v' instead of 'which' Philippe Mathieu-Daudé
2019-07-25 12:45 ` rebecca
2019-07-25 13:36 ` Philippe Mathieu-Daudé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190724214405.16162-1-rebecca@bsdio.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox