From f5203bec11b8caee3d815bc7ec797ab14e88c3fa Mon Sep 17 00:00:00 2001
From: Martin Wimpress <martin@wimpress.org>
Date: Thu, 2 May 2024 17:06:11 +0100
Subject: [PATCH] chore: remove wget

See the following for more information:
- https://github.com/quickemu-project/quickemu/pull/1087
- https://github.com/quickemu-project/quickemu/pull/1133
---
 README.md          |  7 +++----
 debian/control     |  1 -
 docs/quickemu.1.md |  7 +++----
 quickget           | 14 +-------------
 4 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 7359d55..6f708e2 100644
--- a/README.md
+++ b/README.md
@@ -188,7 +188,6 @@ requirements manually:
 -   [socat](http://www.dest-unreach.org/socat/)
 -   [spicy](https://gitlab.freedesktop.org/spice/spice-gtk)
 -   [swtpm](https://github.com/stefanberger/swtpm)
--   [Wget](https://www.gnu.org/software/wget/)
 -   [xdg-user-dirs](https://www.freedesktop.org/wiki/Software/xdg-user-dirs/)
 -   [xrandr](https://gitlab.freedesktop.org/xorg/app/xrandr)
 -   [zsync](http://zsync.moria.org.uk/)
@@ -209,13 +208,13 @@ These examples may save a little typing:
 This also applies to derivatives:
 
 ``` shell
-sudo apt install qemu bash coreutils curl ovmf grep jq lsb-base procps python3 genisoimage usbutils util-linux sed socat spice-client-gtk libtss2-tcti-swtpm0 wget xdg-user-dirs zsync unzip
+sudo apt install qemu bash coreutils curl ovmf grep jq lsb-base procps python3 genisoimage usbutils util-linux sed socat spice-client-gtk libtss2-tcti-swtpm0 xdg-user-dirs zsync unzip
 ```
 
 #### Install requirements on Fedora hosts
 
 ``` shell
-sudo dnf install qemu bash coreutils curl edk2-tools grep jq lsb procps python3 genisoimage usbutils util-linux sed socat spice-gtk-tools swtpm wget xdg-user-dirs xrandr unzip
+sudo dnf install qemu bash coreutils curl edk2-tools grep jq lsb procps python3 genisoimage usbutils util-linux sed socat spice-gtk-tools swtpm xdg-user-dirs xrandr unzip
 ```
 
 #### Install requirements on macOS hosts
@@ -225,7 +224,7 @@ This is a **work in progress** (see [issue
 steps and changes that may enable running on MacOS)
 
 ``` shell
-brew install qemu bash coreutils curl grep jq python@3.10 cdrtools gnu-sed spice-gtk wget zsync
+brew install qemu bash coreutils curl grep jq python@3.10 cdrtools gnu-sed spice-gtk zsync
 ```
 
 ## [Alternative Frontends](https://github.com/quickemu-project/quickemu/wiki/07-Alternative-frontends)
diff --git a/debian/control b/debian/control
index 19735a6..7191dec 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,6 @@ Depends:
  swtpm,
  usbutils,
  util-linux,
- wget,
  x11-xserver-utils,
  xdg-user-dirs,
  zsync,
diff --git a/docs/quickemu.1.md b/docs/quickemu.1.md
index bdca450..7f1d4cb 100644
--- a/docs/quickemu.1.md
+++ b/docs/quickemu.1.md
@@ -210,7 +210,6 @@ requirements manually:
 -   [socat](http://www.dest-unreach.org/socat/)
 -   [spicy](https://gitlab.freedesktop.org/spice/spice-gtk)
 -   [swtpm](https://github.com/stefanberger/swtpm)
--   [Wget](https://www.gnu.org/software/wget/)
 -   [xdg-user-dirs](https://www.freedesktop.org/wiki/Software/xdg-user-dirs/)
 -   [xrandr](https://gitlab.freedesktop.org/xorg/app/xrandr)
 -   [zsync](http://zsync.moria.org.uk/)
@@ -231,13 +230,13 @@ These examples may save a little typing:
 This also applies to derivatives:
 
 ``` shell
-sudo apt install qemu bash coreutils curl ovmf grep jq lsb-base procps python3 genisoimage usbutils util-linux sed socat spice-client-gtk libtss2-tcti-swtpm0 wget xdg-user-dirs zsync unzip
+sudo apt install qemu bash coreutils curl ovmf grep jq lsb-base procps python3 genisoimage usbutils util-linux sed socat spice-client-gtk libtss2-tcti-swtpm0 xdg-user-dirs zsync unzip
 ```
 
 #### Install requirements on Fedora hosts
 
 ``` shell
-sudo dnf install qemu bash coreutils curl edk2-tools grep jq lsb procps python3 genisoimage usbutils util-linux sed socat spice-gtk-tools swtpm wget xdg-user-dirs xrandr unzip
+sudo dnf install qemu bash coreutils curl edk2-tools grep jq lsb procps python3 genisoimage usbutils util-linux sed socat spice-gtk-tools swtpm xdg-user-dirs xrandr unzip
 ```
 
 #### Install requirements on macOS hosts
@@ -247,7 +246,7 @@ This is a **work in progress** (see [issue
 steps and changes that may enable running on MacOS)
 
 ``` shell
-brew install qemu bash coreutils curl grep jq python@3.10 cdrtools gnu-sed spice-gtk wget zsync
+brew install qemu bash coreutils curl grep jq python@3.10 cdrtools gnu-sed spice-gtk zsync
 ```
 
 ## [Alternative Frontends](https://github.com/quickemu-project/quickemu/wiki/07-Alternative-frontends)
diff --git a/quickget b/quickget
index 1fd8fb8..a5006ec 100755
--- a/quickget
+++ b/quickget
@@ -1221,19 +1221,7 @@ function web_get() {
 
     if ! curl --progress-bar --location --output "${DIR}/${FILE}" --continue-at - --user-agent "${USER_AGENT}" "${HEADERS[@]}" -- "${URL}"; then
         echo "ERROR! Failed to download ${URL} with curl."
-        echo "       Will try again with wget."
         rm -f "${DIR}/${FILE}"
-        if command -v wget2 &>/dev/null; then
-            if ! wget2 --quiet --continue --tries=3 --read-timeout=10 --force-progress --progress=bar:force:noscroll "${URL}" -O "${DIR}/${FILE}" "${HEADERS[@]}"; then
-                echo "ERROR! Failed to download ${URL} with wget2."
-                echo "       Try deleting '${DIR}/${FILE}' running 'quickget' again."
-                exit 1
-            fi
-        elif ! wget --quiet --continue --tries=3 --read-timeout=10 --show-progress --progress=bar:force:noscroll "${URL}" -O "${DIR}/${FILE}" "${HEADERS[@]}"; then
-            echo "ERROR! Failed to download ${URL} with wget."
-            echo "       Try deleting '${DIR}/${FILE}' running 'quickget' again."
-            exit 1
-        fi
     fi
 }
 
@@ -1300,7 +1288,7 @@ function zsync_get() {
             rm "${DIR}/${OUT}.zs-old"
         fi
     else
-        echo "INFO: zsync not found, falling back to curl/wget"
+        echo "INFO: zsync not found, falling back to curl"
         if [ -n "${3}" ]; then
             web_get "${1}" "${2}" "${3}"
         else