From 50eef5bd9a5cee6596124d5827db8de15ee413b9 Mon Sep 17 00:00:00 2001 From: John McQuah Date: Mon, 10 Oct 2022 13:50:03 -0400 Subject: [PATCH] pkgmeek: use curl by default, not wget --- scripts/pkgmeek | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/pkgmeek b/scripts/pkgmeek index c8807b3..7160f32 100755 --- a/scripts/pkgmeek +++ b/scripts/pkgmeek @@ -132,8 +132,8 @@ readonly cs_fail_msg="Use '--ignore-signature' to override, if you have determin [ "$PKGMK_IGNORE_SIG" = "yes" ] || { check_signature "pre-build" | parse_signify_output; case $? in 0) info "Sources successfully authenticated." ;; - 1) error "Signature file missing or corrupted." ; echo "$cs_fail_msg" ;; - 2) error "Failed to authenticate remote sources using signify." ; echo "$cs_fail_msg" ;; + 1) error "Signature file missing or corrupted." ; echo "$cs_fail_msg" ; exit $E_SIGNATURE ;; + 2) error "Failed to authenticate remote sources using signify." ; echo "$cs_fail_msg" ; exit $E_SIGNATURE ;; esac; } [ "$PKGMK_CHECK_SIG" = "no" ] || exit 0 # no need to continue if the user only requested -cs @@ -220,7 +220,7 @@ readonly PKGMK_VERSION="#VERSION#" readonly PKGMK_COMMAND="$0" readonly PKGMK_ROOT="$PWD" readonly PRTWASH_COMMAND="/usr/bin/prtwash" -PKGMK_DOWNLOAD_PROG="/usr/bin/wget" +PKGMK_DOWNLOAD_PROG="/usr/bin/curl" PKGMK_GIT_COMMAND="/usr/bin/git" PKGMK_CONF="/etc/pkgmk.conf" @@ -389,7 +389,7 @@ fetch_url() { # haven't returned yet, so a different transport protocol must be in effect [[ "$PKGMK_DOWNLOAD_PROG" =~ wget$ ]] && { OCONTINUE="-c"; OOUT="--compression=none --passive-ftp --no-directories --tries=3 --waitretry=3 $PKGMK_WGET_OPTIONS -O"; } - [[ "$PKGMK_DOWNLOAD_PROG" =~ curl$ ]] && { OCONTINUE="-C -"; OOUT="-L --fail --ftp-pasv --retry 3 --retry-delay 3 $PKGMK_CURL_OPTIONS -o"; } + [[ "$PKGMK_DOWNLOAD_PROG" =~ curl$ ]] && { OCONTINUE="-C -"; OOUT="-L -# --fail --ftp-pasv --retry 3 --retry-delay 3 $PKGMK_CURL_OPTIONS -o"; } [[ "$PKGMK_DOWNLOAD_PROG" =~ (wget|curl)$ ]] || SAVE_AS=/bin/false # start with the mirrors defined in pkgmk.conf, then go to the url found in the Pkgfile