[jhalfs] 04/04: Merge branch 'trunk' into plabs/check-version

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch plabs/check-version
in repository jhalfs.

commit 18f9adfb0367fe15165eb594e2f38c818c530872
Merge: b47a980 40e87da
Author: Pierre Labastie <[email protected]>
AuthorDate: Fri Jan 24 18:59:43 2025 +0100

    Merge branch 'trunk' into plabs/check-version

 common/libs/func_check_version.sh | 39 +++++++++++++++++++++++++++++++--------
 common/libs/func_download_pkgs    | 22 ++++++++++++++++------
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --cc common/libs/func_download_pkgs
index aeeec3f,777b879..ba9b98b
--- a/common/libs/func_download_pkgs
+++ b/common/libs/func_download_pkgs
@@@ -8,14 -8,23 +8,24 @@@ get_sources() {              # Downloa
    [ "$GETPKG" = y ] || return 0
  
    local URL FILE BOOKMD5 MD5 HAVEMD5 fromARCHIVE WGETPARAM MAYBEMORE
 +  local PKGVER PKGDIR
  
-   WGETPARAM=""
-   if [[ "${RETRYSRCDOWNLOAD}" = "y" ]] ; then
-     WGETPARAM+="--retry-connrefused"
+   DOWNLDPARAM=""
+   if [ "$DOWNLOADER" = "wget" ] ; then
+     if [[ "${RETRYSRCDOWNLOAD}" = "y" ]] ; then
+       DOWNLDPARAM+="--retry-connrefused"
+     fi
+     DOWNLDPARAM+=" --tries ${RETRYDOWNLOADCNT}"
+     DOWNLDPARAM+=" --timeout ${DOWNLOADTIMEOUT}"
+   fi
+   if [ "$DOWNLOADER" = "curl" ] ; then
+     if [[ "${RETRYSRCDOWNLOAD}" = "y" ]] ; then
+       DOWNLDPARAM+="--retry-connrefused"
+     fi
+     DOWNLDPARAM+=" -LO"
+     DOWNLDPARAM+=" --retry ${RETRYDOWNLOADCNT}"
+     DOWNLDPARAM+=" --max-time ${DOWNLOADTIMEOUT}"
    fi
-   WGETPARAM+=" --tries ${RETRYDOWNLOADCNT}"
-   WGETPARAM+=" --timeout ${DOWNLOADTIMEOUT}"
  
    gs_wrt_message(){
      echo "${RED}$1${OFF}"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page