diff --git a/basic.sh b/basic.sh index 108e29f..add14b5 100755 --- a/basic.sh +++ b/basic.sh @@ -14,8 +14,8 @@ qemu-system-x86_64 \ -cpu Penryn,vendor=GenuineIntel,kvm=on,+sse3,+sse4.2,+aes,+xsave,+avx,+xsaveopt,+xsavec,+xgetbv1,+avx2,+bmi2,+smep,+bmi1,+fma,+movbe,+invtsc \ -device isa-applesmc,osk="$OSK" \ -smbios type=2 \ - -drive if=pflash,format=raw,readonly,file=$OVMF/OVMF_CODE.fd \ - -drive if=pflash,format=raw,file=$OVMF/OVMF_VARS-1024x768.fd \ + -drive if=pflash,format=raw,readonly,file="$OVMF/OVMF_CODE.fd" \ + -drive if=pflash,format=raw,file="$OVMF/OVMF_VARS-1024x768.fd" \ -vga qxl \ -device ich9-intel-hda -device hda-output \ -usb -device usb-kbd -device usb-mouse \ diff --git a/headless.sh b/headless.sh index a4d812a..bff4f74 100755 --- a/headless.sh +++ b/headless.sh @@ -36,8 +36,8 @@ qemu-system-x86_64 \ -cpu Penryn,vendor=GenuineIntel,kvm=on,+sse3,+sse4.2,+aes,+xsave,+avx,+xsaveopt,+xsavec,+xgetbv1,+avx2,+bmi2,+smep,+bmi1,+fma,+movbe,+invtsc \ -device isa-applesmc,osk="$OSK" \ -smbios type=2 \ - -drive if=pflash,format=raw,readonly,file=$OVMF/OVMF_CODE.fd \ - -drive if=pflash,format=raw,file=$OVMF/OVMF_VARS-1024x768.fd \ + -drive if=pflash,format=raw,readonly,file="$OVMF/OVMF_CODE.fd" \ + -drive if=pflash,format=raw,file="$OVMF/OVMF_VARS-1024x768.fd" \ -vga qxl \ -usb -device usb-kbd -device usb-tablet \ -netdev user,id=net0 \ @@ -49,4 +49,4 @@ qemu-system-x86_64 \ -device ide-hd,bus=sata.3,drive=InstallMedia \ -drive id=SystemDisk,if=none,file="${SYSTEM_DISK}" \ -device ide-hd,bus=sata.4,drive=SystemDisk \ - ${MOREARGS[@]} \ No newline at end of file + "${MOREARGS[@]}" diff --git a/jumpstart.sh b/jumpstart.sh index fbe1ba4..fa19774 100755 --- a/jumpstart.sh +++ b/jumpstart.sh @@ -16,24 +16,24 @@ print_usage() { } error() { - local error_message="$@" + local error_message="$*" echo "${error_message}" 1>&2; } argument="$1" case $argument in - -s|--high-sierra) - $TOOLS/FetchMacOS/fetch.sh -p 091-95155 -c PublicRelease13 || exit 1; - ;; - -m|--mojave) - $TOOLS/FetchMacOS/fetch.sh -l -c PublicRelease14 || exit 1; - ;; - -c|--catalina|*) - $TOOLS/FetchMacOS/fetch.sh -l -c DeveloperSeed || exit 1; - ;; -h|--help) print_usage ;; + -s|--high-sierra) + "$TOOLS/FetchMacOS/fetch.sh" -p 091-95155 -c PublicRelease13 || exit 1; + ;; + -m|--mojave) + "$TOOLS/FetchMacOS/fetch.sh" -l -c PublicRelease14 || exit 1; + ;; + -c|--catalina|*) + "$TOOLS/FetchMacOS/fetch.sh" -l -c DeveloperSeed || exit 1; + ;; esac -$TOOLS/dmg2img $TOOLS/FetchMacOS/BaseSystem/BaseSystem.dmg $PWD/BaseSystem.img +"$TOOLS/dmg2img" "$TOOLS/FetchMacOS/BaseSystem/BaseSystem.dmg" "$PWD/BaseSystem.img" diff --git a/make.sh b/make.sh index 11eec8f..8495561 100755 --- a/make.sh +++ b/make.sh @@ -4,7 +4,7 @@ # by Foxlet VMDIR=$PWD -MACHINE=$(qemu-system-x86_64 --machine help | grep q35 | cut -d" " -f1 | egrep -oe ".*-[0-9.]+" | sort -rV | head -1) +MACHINE="$(qemu-system-x86_64 --machine help | grep q35 | cut -d" " -f1 | grep -Eoe ".*-[0-9.]+" | sort -rV | head -1)" OUT="template.xml" print_usage() { @@ -16,7 +16,7 @@ print_usage() { } error() { - local error_message="$@" + local error_message="$*" echo "${error_message}" 1>&2; } diff --git a/virtio.sh b/virtio.sh index aae2b20..a0d59ee 100755 --- a/virtio.sh +++ b/virtio.sh @@ -15,8 +15,8 @@ qemu-system-x86_64 \ -cpu Penryn,vendor=GenuineIntel,kvm=on,+sse3,+sse4.2,+aes,+xsave,+avx,+xsaveopt,+xsavec,+xgetbv1,+avx2,+bmi2,+smep,+bmi1,+fma,+movbe,+invtsc \ -device isa-applesmc,osk="$OSK" \ -smbios type=2 \ - -drive if=pflash,format=raw,readonly,file=$OVMF/OVMF_CODE.fd \ - -drive if=pflash,format=raw,file=$OVMF/OVMF_VARS-1024x768.fd \ + -drive if=pflash,format=raw,readonly,file="$OVMF/OVMF_CODE.fd" \ + -drive if=pflash,format=raw,file="$OVMF/OVMF_VARS-1024x768.fd" \ -vga std \ -device ich9-intel-hda -device hda-output \ -usb -device usb-kbd -device usb-mouse \