Move from wget to curl only rely on one tool

Instead of using wget and curl for different installation tasks, move
all usages to curl to only rely on one tool.

Signed-off-by: Xavier Delaruelle <[email protected]>

Author: xdelaruelle

.cirrus.yml

@@ -83,7 +83,7 @@ task:
     image_family: freebsd-14-2
     cpu: 1
     memory: 2G
-  reqinstall_script: pkg install -y bash wget gmake dejagnu py311-sphinx gzip tcl86 tcl-wrapper autoconf ksh93 zsh fish perl5 python311 ruby cmake R readline
+  reqinstall_script: pkg install -y bash curl gmake dejagnu py311-sphinx gzip tcl86 tcl-wrapper autoconf ksh93 zsh fish perl5 python311 ruby cmake R readline
   configure_script:
     - ./configure
   << : *BUILD_INSTALL_TEST_TEMPLATE
@@ -130,7 +130,7 @@ task:
     yes | unminimize || true
     # install requirements
     apt-get update
-    apt-get -y install curl wget expect-dev dejagnu python3-sphinx gzip man-db bash tcsh ksh zsh fish tcl tcl8.6 perl python3 ruby cmake r-base-core
+    apt-get -y install curl expect-dev dejagnu python3-sphinx gzip man-db bash tcsh ksh zsh fish tcl tcl8.6 perl python3 ruby cmake r-base-core
     # libtclenvmodules build requirements
     apt-get -y install gcc autoconf tcl8.6-dev
     # requirements for source-sh extra tests
@@ -193,7 +193,7 @@ task:
     # another one from EPEL (as dependency for R-core) on recent RockyLinux 8
     yum install -y environment-modules
     yum install -y epel-release
-    yum install -y tcsh zsh ksh tcl perl python36 gzip ruby cmake R-core make wget perl python3-sphinx git dejagnu man-db rpm-build bzip2 autoconf gcc tcl-devel emacs
+    yum install -y tcsh zsh ksh tcl perl python36 gzip ruby cmake R-core make curl perl python3-sphinx git dejagnu man-db rpm-build bzip2 autoconf gcc tcl-devel emacs
     yum install -y which xorg-x11-server-utils xorg-x11-server-Xvfb
     yum install -y fish
   configure_script:
@@ -217,7 +217,7 @@ task:
   reqinstall_script: |
     dnf install -y dnf-plugins-core epel-release
     dnf config-manager --set-enabled crb
-    dnf install -y tcsh zsh ksh fish tcl perl python3 gzip ruby cmake R-core make wget perl python3-sphinx git dejagnu man-db rpm-build bzip2 autoconf gcc tcl-devel procps-ng emacs
+    dnf install -y tcsh zsh ksh fish tcl perl python3 gzip ruby cmake R-core make perl python3-sphinx git dejagnu man-db rpm-build bzip2 autoconf gcc tcl-devel procps-ng emacs
   configure_script:
     - ./configure --with-bashcompletiondir=/usr/share/bash-completion/completions --with-fishcompletiondir=/usr/share/fish/vendor_completions.d --with-zshcompletiondir=/usr/share/zsh/site-functions
   # also enable a display on this test case to validate x-resource behavior
@@ -234,7 +234,7 @@ task:
     cpu: 1
     memory: 2G
   reqinstall_script: |
-    zypper install -y tcsh zsh ksh fish tcl perl python3 ruby cmake R-core R-core-packages make wget python3-Sphinx gzip git dejagnu man net-tools autoconf gcc tcl-devel util-linux-systemd procps
+    zypper install -y tcsh zsh ksh fish tcl perl python3 ruby cmake R-core R-core-packages make curl python3-Sphinx gzip git dejagnu man net-tools autoconf gcc tcl-devel util-linux-systemd procps
     zypper install -y which xrdb xvfb-run
   configure_script:
     - ./configure --enable-versioning --with-loadedmodules=null:dot --with-quarantine-vars='LD_LIBRARY_PATH LD_PRELOAD'

.github/workflows/windows_tests.yaml

@@ -127,7 +127,7 @@ jobs:
           # of python39-sphinx package is regularly broken
           # precise liblapack0 package needed by R package (missing dependency
           # since R-4.2.1-1)
-          packages: make sed git autoconf automake libtool tcl dejagnu python39 python39-sphinx gzip ruby zsh tcsh mksh fish cmake R liblapack0 tcl-devel gcc-core wget python39-sphinxcontrib-applehelp python39-sphinxcontrib-devhelp python39-sphinxcontrib-htmlhelp python39-sphinxcontrib-jsmath python39-sphinxcontrib-qthelp python39-sphinxcontrib-serializinghtml python39-sphinxcontrib-websupport python39-alabaster python39-sqlalchemy
+          packages: make sed git autoconf automake libtool tcl dejagnu python39 python39-sphinx gzip ruby zsh tcsh mksh fish cmake R liblapack0 tcl-devel gcc-core curl python39-sphinxcontrib-applehelp python39-sphinxcontrib-devhelp python39-sphinxcontrib-htmlhelp python39-sphinxcontrib-jsmath python39-sphinxcontrib-qthelp python39-sphinxcontrib-serializinghtml python39-sphinxcontrib-websupport python39-alabaster python39-sqlalchemy
       - name: Configure Git safe.directory
         run: |
           bash -lc 'git config --global --add safe.directory $(cygpath -u "$GITHUB_WORKSPACE")'
@@ -171,7 +171,7 @@ jobs:
       - name: Install system packages
         shell: msys2 {0}
         run: |
-          pacman --noconfirm --noprogressbar -S tcl tcl-devel dejagnu python ruby cmake zsh tcsh mksh fish gcc autoconf make git wget gzip
+          pacman --noconfirm --noprogressbar -S tcl tcl-devel dejagnu python ruby cmake zsh tcsh mksh fish gcc autoconf make git curl gzip
       - name: Build Modules
         shell: msys2 {0}
         run: |

Makefile

@@ -13,7 +13,8 @@ INSTALL_DATA = $(INSTALL) -m 644
 INSTALL_PROGRAM = $(INSTALL) -m 755
 
 # download command and its options
-WGET := wget --retry-connrefused --waitretry=20 --timeout=20 --tries=3
+CURL := curl --location --remote-name --retry 3 --retry-connrefused \
+	--retry-delay 20 --max-time 20
 
 # definitions for code coverage
 NAGELFAR_DLSRC1 := http://downloads.sourceforge.net/nagelfar/
@@ -1017,14 +1018,14 @@ testlint: initdir modulecmd.tcl $(NAGELFAR) script/add.modules script/modulecmd
 
 # install enhanced diff tool (to review test results)
 icdiff:
-	$(WGET) $(ICDIFF_DLSRC)$@ || true
+	$(CURL) $(ICDIFF_DLSRC)$@
 	echo "$(ICDIFF_CHECKSUM)  $@" | md5sum --status -c - || \
 		md5 -c $(ICDIFF_CHECKSUM) $@
 	chmod +x $@
 
 # install old Tcl interpreter (for code coverage purpose)
 tclsh83:
-	$(WGET) $(TCL_DLSRC)$(TCL_DIST83) || true
+	$(CURL) $(TCL_DLSRC)$(TCL_DIST83)
 	echo "$(TCL_DISTSUM83)  $(TCL_DIST83)" | md5sum --status -c - || \
 		md5 -c $(TCL_DISTSUM83) $@ || (rm -f $(TCL_DIST83) && false)
 	tar xzf $(TCL_DIST83)
@@ -1041,7 +1042,7 @@ spack:
 
 # install Conda (for source-sh test purpose)
 miniconda3:
-	$(WGET) $(MINICONDA_DLSRC)$(MINICONDA_DIST) || true
+	$(CURL) $(MINICONDA_DLSRC)$(MINICONDA_DIST)
 	echo "$(MINICONDA_DISTSUM)  $(MINICONDA_DIST)" | md5sum --status -c - || \
 		md5 -c $(MINICONDA_DISTSUM) $@ || (rm -f $(MINICONDA_DIST) && false)
 	bash $(MINICONDA_DIST) -b -s -p ./miniconda3
@@ -1054,7 +1055,7 @@ OpenFOAM-dev:
 # install code coverage tool
 # download from alt. source if correct tarball not retrieved from primary location
 $(NAGELFAR):
-	$(WGET) $(NAGELFAR_DLSRC1)$(NAGELFAR_DIST) || true
+	$(CURL) $(NAGELFAR_DLSRC1)$(NAGELFAR_DIST)
 	echo "$(NAGELFAR_DISTSUM)  $(NAGELFAR_DIST)" | md5sum --status -c - || \
 		(rm -f $(NAGELFAR_DIST) && false)
 	tar xzf $(NAGELFAR_DIST)

script/mpub

@@ -179,9 +179,9 @@ file delete mpubbatch
 
 file mkdir dlcheck
 cd dlcheck
-runcmd 2>@$logfid wget -O $distgz $dlurl/$distgz
-runcmd 2>@$logfid wget -O $distbz $dlurl/$distbz
-runcmd 2>@$logfid wget -O $distwin $dlurl/$distwin
+runcmd 2>@$logfid curl -LJO $dlurl/$distgz
+runcmd 2>@$logfid curl -LJO $dlurl/$distbz
+runcmd 2>@$logfid curl -LJO $dlurl/$distwin
 runcmd md5sum --check ../mpub.ok
 
 file delete $distgz $distbz $distwin

script/mrel

@@ -258,8 +258,8 @@ extractflist $relver-win log-win distfiles-win
 # fetch previous dists
 set prevdistgz modules-$prevver.tar.gz
 set prevdistwin modules-$prevver-win.zip
-runcmd 2>@$logfid wget -O $prevdistgz $dlurl/$prevtag/$prevdistgz
-runcmd 2>@$logfid wget -O $prevdistwin $dlurl/$prevtag/$prevdistwin
+runcmd 2>@$logfid curl -LO $dlurl/$prevtag/$prevdistgz
+runcmd 2>@$logfid curl -LO $dlurl/$prevtag/$prevdistwin
 
 # prepare previous version dist file list to compare to previous dist
 runcmd >log-prev-gz tar tfz $prevdistgz
@@ -347,7 +347,7 @@ runcmd 2>@$logfid make uninstall
 runcmd make clean
 
 cd /tmp/mods+test-export
-runcmd 2>@$logfid wget -O $reltag.tar.gz $ghexporturl
+runcmd 2>@$logfid curl -LO $ghexporturl
 runcmd tar xfz $reltag.tar.gz
 cd modules-$relver
 reportInfo "Moved into '[pwd]' directory"
@@ -436,8 +436,8 @@ while {[array size koji_tasks]} {
 # ---------------------------------------------------------
 
 reportInfo "Checking CI tests status on $ghstatusurl"
-while {[set cistatus [lindex [split [string range [exec wget -q -O -\
-   $ghstatusurl] 0 30] \"] 3]] eq {pending}} {
+while {[set cistatus [lindex [split [string range [exec curl -s $ghstatusurl]\
+   0 30] \"] 3]] eq {pending}} {
    reportInfo "CI tests still in progress"
    # wait 30 seconds before next check loop
    after 30000