oSoWoSo/DistroHopper
1
0
Fork 0
mirror of https://github.com/oSoWoSo/DistroHopper.git synced 2024-08-14 22:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace the use of which with command -v

Browse source
This commit is contained in:
Martin Wimpress 2021-10-18 16:33:50 +01:00 • committed by Martin Wimpress
parent d785c89a38
commit 45457c8808
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
quickemu
View file

@ -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