Merge pull request #323 from philclifford/merging-fixes

Merging fixes - Consolidated PR of some pending bug fixes
This commit is contained in:
Martin Wimpress 2022-02-17 09:50:34 +00:00 committed by GitHub
commit a624bf69a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -1136,7 +1136,7 @@ fi
# TODO: Make this run the native architecture binary
QEMU=$(command -v qemu-system-x86_64)
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 make install qemu-system-x86_64 and qemu-img"
exit 1
fi

View File

@ -286,6 +286,7 @@ function releases_debian() {
standard \
xfce
}
function releases_cachyos() {
echo 2022.01.09
}
@ -589,7 +590,7 @@ function zsync_get() {
fi
else
echo "INFO: zsync not found, falling back to wget"
web_get "${ISO}"
web_get "${ISO}" "${DIR}"
fi
}