Replace the use of which with command -v
This commit is contained in:
parent
d785c89a38
commit
45457c8808
8
quickemu
8
quickemu
@ -491,7 +491,7 @@ function vm_boot() {
|
|||||||
|
|
||||||
# Enable TPM
|
# Enable TPM
|
||||||
if [ "${tpm}" == "on" ]; then
|
if [ "${tpm}" == "on" ]; then
|
||||||
if which swtpm > /dev/null; then
|
if command -v swtpm &>/dev/null; then
|
||||||
swtpm socket \
|
swtpm socket \
|
||||||
--ctrl type=unixio,path="${VMDIR}/${VMNAME}.swtpm-sock" \
|
--ctrl type=unixio,path="${VMDIR}/${VMNAME}.swtpm-sock" \
|
||||||
--terminate \
|
--terminate \
|
||||||
@ -901,8 +901,8 @@ if command -v xdg-user-dir &>/dev/null; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# TODO: Make this run the native architecture binary
|
# TODO: Make this run the native architecture binary
|
||||||
QEMU=$(which qemu-system-x86_64)
|
QEMU=$(command -v qemu-system-x86_64)
|
||||||
QEMU_IMG=$(which qemu-img)
|
QEMU_IMG=$(command -v qemu-img)
|
||||||
if [ ! -e "${QEMU}" ] && [ ! -e "${QEMU_IMG}" ]; then
|
if [ ! -e "${QEMU}" ] && [ ! -e "${QEMU_IMG}" ]; then
|
||||||
echo "ERROR! qemu not found. Please install qemu."
|
echo "ERROR! qemu not found. Please install qemu."
|
||||||
exit 1
|
exit 1
|
||||||
@ -929,7 +929,7 @@ else
|
|||||||
if [ "${OUTPUT}" != "gtk" ] && [ "${OUTPUT}" != "sdl" ] && [ "${OUTPUT}" != "spice" ]; then
|
if [ "${OUTPUT}" != "gtk" ] && [ "${OUTPUT}" != "sdl" ] && [ "${OUTPUT}" != "spice" ]; then
|
||||||
echo "ERROR! Requested output '${OUTPUT}' is not recognised."
|
echo "ERROR! Requested output '${OUTPUT}' is not recognised."
|
||||||
exit 1
|
exit 1
|
||||||
elif [ "${OUTPUT}" == "spice" ] && [ ! "$(which spicy)" ]; then
|
elif [ "${OUTPUT}" == "spice" ] && ! command -v spicy &>/dev/null; then
|
||||||
echo "ERROR! Requested SPICE display, but 'spicy' is not installed."
|
echo "ERROR! Requested SPICE display, but 'spicy' is not installed."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user