Merge pull request #9258 from oech3/wgetcurl

Avoid mixing wget and curl

Author: sylvestre

GNUmakefile

@@ -345,7 +345,7 @@ test_toybox:
 toybox-src:
 	if [ ! -e "$(TOYBOX_SRC)" ] ; then \
 		mkdir -p "$(TOYBOX_ROOT)" ; \
-		wget "https://github.com/landley/toybox/archive/refs/tags/$(TOYBOX_VER).tar.gz" -P "$(TOYBOX_ROOT)" ; \
+		curl -Ls "https://github.com/landley/toybox/archive/refs/tags/$(TOYBOX_VER).tar.gz" -o "$(TOYBOX_ROOT)/$(TOYBOX_VER).tar.gz" ; \
 		tar -C "$(TOYBOX_ROOT)" -xf "$(TOYBOX_ROOT)/$(TOYBOX_VER).tar.gz" ; \
 		sed -i -e "s|TESTDIR=\".*\"|TESTDIR=\"$(BUILDDIR)\"|g" $(TOYBOX_SRC)/scripts/test.sh; \
 		sed -i -e "s/ || exit 1//g" $(TOYBOX_SRC)/scripts/test.sh; \
@@ -354,8 +354,8 @@ toybox-src:
 busybox-src:
 	if [ ! -e "$(BUSYBOX_SRC)" ] ; then \
 		mkdir -p "$(BUSYBOX_ROOT)" ; \
-		wget "https://busybox.net/downloads/busybox-$(BUSYBOX_VER).tar.bz2" -P "$(BUSYBOX_ROOT)" ; \
-		tar -C "$(BUSYBOX_ROOT)" -xf "$(BUSYBOX_ROOT)/busybox-$(BUSYBOX_VER).tar.bz2" ; \
+		curl -Ls "https://github.com/mirror/busybox/archive/refs/tags/$(subst .,_,$(BUSYBOX_VER)).tar.gz" -o "$(BUSYBOX_ROOT)/busybox-$(BUSYBOX_VER).tar.gz" ; \
+		tar -C "$(BUSYBOX_ROOT)" -xf "$(BUSYBOX_ROOT)/busybox-$(BUSYBOX_VER).tar.gz" ; \
 	fi ;
 
 # This is a busybox-specific config file their test suite wants to parse.

src/uu/head/BENCHMARKING.md

@@ -20,7 +20,7 @@ William Shakespeare*, which is in the public domain in the United States
 and most other parts of the world.
 
 ```shell
-wget -O shakespeare.txt https://www.gutenberg.org/files/100/100-0.txt
+curl -o shakespeare.txt https://www.gutenberg.org/files/100/100-0.txt
 ```
 
 This particular file has about 170,000 lines, each of which is no longer

src/uu/shuf/BENCHMARKING.md

@@ -14,7 +14,7 @@ renaming the executable from `shuf` to `shuf.old`.
 Sample input can be generated using `/dev/random`:
 
 ```shell
-wget -O input.txt https://www.gutenberg.org/files/100/100-0.txt
+curl -o input.txt https://www.gutenberg.org/files/100/100-0.txt
 ```
 
 To avoid distortions from IO, it is recommended to store input data in tmpfs.

src/uu/wc/BENCHMARKING.md

@@ -56,7 +56,7 @@ To get a file with less artificial contents, download a book from
 Project Gutenberg and concatenate it a lot of times:
 
 ```shell
-wget https://www.gutenberg.org/files/2701/2701-0.txt -O moby.txt
+curl https://www.gutenberg.org/files/2701/2701-0.txt -o moby.txt
 cat moby.txt moby.txt moby.txt moby.txt > moby4.txt
 cat moby4.txt moby4.txt moby4.txt moby4.txt > moby16.txt
 cat moby16.txt moby16.txt moby16.txt moby16.txt > moby64.txt
@@ -65,7 +65,7 @@ cat moby16.txt moby16.txt moby16.txt moby16.txt > moby64.txt
 And get one with lots of unicode too:
 
 ```shell
-wget https://www.gutenberg.org/files/30613/30613-0.txt -O odyssey.txt
+curl https://www.gutenberg.org/files/30613/30613-0.txt -o odyssey.txt
 cat odyssey.txt odyssey.txt odyssey.txt odyssey.txt > odyssey4.txt
 cat odyssey4.txt odyssey4.txt odyssey4.txt odyssey4.txt > odyssey16.txt
 cat odyssey16.txt odyssey16.txt odyssey16.txt odyssey16.txt > odyssey64.txt

util/android-commands.sh

@@ -329,7 +329,7 @@ init() {
     snapshot_name="${AVD_CACHE_KEY}"
 
     # shellcheck disable=SC2015
-    wget -nv "https://github.com/termux/termux-app/releases/download/${termux}/termux-app_${termux}+github-debug_${arch}.apk" &&
+    curl -sLO "https://github.com/termux/termux-app/releases/download/${termux}/termux-app_${termux}+github-debug_${arch}.apk" &&
         snapshot "termux-app_${termux}+github-debug_${arch}.apk" &&
         hash_rustc &&
         exit_termux &&