From 77c1bff9187c132a06a575bd54b61a9b1432886c Mon Sep 17 00:00:00 2001 From: ChandonPierre Date: Fri, 30 Sep 2022 08:49:17 -0400 Subject: [PATCH] feat: Replace `wget` with `curl` --- generate-specific-bootdisk.sh | 6 +++--- generate-unique-machine-values.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/generate-specific-bootdisk.sh b/generate-specific-bootdisk.sh index 146abbc..48070a0 100755 --- a/generate-specific-bootdisk.sh +++ b/generate-specific-bootdisk.sh @@ -228,14 +228,14 @@ generate_bootdisk () { echo 'You specified both a custom plist FILE & custom plist URL.' echo 'Use only one of those options.' elif [ "${MASTER_PLIST_URL}" ]; then - wget -O "${MASTER_PLIST:=./config-custom.plist}" "${MASTER_PLIST_URL}" + curl -L -o "${MASTER_PLIST:=./config-custom.plist}" "${MASTER_PLIST_URL}" else # default is config-nopicker-custom.plist from OSX-KVM with placeholders used in Docker-OSX - wget -O "${MASTER_PLIST:=./config-nopicker-custom.plist}" "${MASTER_PLIST_URL}" + curl -L -o "${MASTER_PLIST:=./config-nopicker-custom.plist}" "${MASTER_PLIST_URL}" fi [ -e ./opencore-image-ng.sh ] \ - || { wget "${OPENCORE_IMAGE_MAKER_URL}" \ + || { curl -OL "${OPENCORE_IMAGE_MAKER_URL}" \ && chmod +x opencore-image-ng.sh ; } # plist required for bootdisks, so create anyway. diff --git a/generate-unique-machine-values.sh b/generate-unique-machine-values.sh index d62b1f8..f1666cd 100755 --- a/generate-unique-machine-values.sh +++ b/generate-unique-machine-values.sh @@ -222,7 +222,7 @@ build_mac_serial () { download_vendor_mac_addresses () { # download the MAC Address vendor list - [ -e "${MAC_ADDRESSES_FILE:=vendor_macs.tsv}" ] || wget -O "${MAC_ADDRESSES_FILE}" https://gitlab.com/wireshark/wireshark/-/raw/master/manuf + [ -e "${MAC_ADDRESSES_FILE:=vendor_macs.tsv}" ] || curl -L -o "${MAC_ADDRESSES_FILE}" https://gitlab.com/wireshark/wireshark/-/raw/master/manuf } download_qcow_efi_folder () { @@ -328,10 +328,10 @@ EOF echo 'You specified both a custom plist FILE & custom plist URL.' echo 'Use only one of those options.' elif [ "${MASTER_PLIST_URL}" ]; then - wget -O "${MASTER_PLIST:=./config-custom.plist}" "${MASTER_PLIST_URL}" + curl -L -o "${MASTER_PLIST:=./config-custom.plist}" "${MASTER_PLIST_URL}" else # default is config-nopicker-custom.plist from OSX-KVM with placeholders used in Docker-OSX - wget -O "${MASTER_PLIST:=./config-nopicker-custom.plist}" "${MASTER_PLIST_URL}" + curl -L -o "${MASTER_PLIST:=./config-nopicker-custom.plist}" "${MASTER_PLIST_URL}" fi mkdir -p "${OUTPUT_DIRECTORY}/plists" @@ -352,7 +352,7 @@ EOF # make bootdisk qcow2 format if --bootdisks, but also if you set the bootdisk filename if [ "${CREATE_BOOTDISKS}" ] || [ "${OUTPUT_BOOTDISK}" ]; then [ -e ./opencore-image-ng.sh ] \ - || { wget "${OPENCORE_IMAGE_MAKER_URL}" \ + || { curl -L -O "${OPENCORE_IMAGE_MAKER_URL}" \ && chmod +x opencore-image-ng.sh ; } mkdir -p "${OUTPUT_DIRECTORY}/bootdisks" ./opencore-image-ng.sh \