From 183b23acf93e6f3972b1a3a82d46e9567544c1e9 Mon Sep 17 00:00:00 2001 From: Alexander Grund Date: Wed, 3 Jul 2024 18:02:07 +0200 Subject: [PATCH] Fix add-apt-keys Remove faulty loop as curl already has the retry option Also add failed message --- ci/add-apt-keys.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ci/add-apt-keys.sh b/ci/add-apt-keys.sh index 3f6e2e1..f834902 100755 --- a/ci/add-apt-keys.sh +++ b/ci/add-apt-keys.sh @@ -23,11 +23,10 @@ function do_add_key keyfilename=$(basename -s .key "$key_url") fi echo -e "\tDownloading APT key from '$key_url' to '$keyfilename'" - for i in {1..${NET_RETRY_COUNT:-3}}; do - curl -sSL --retry ${NET_RETRY_COUNT:-5} "$key_url" | sudo gpg --dearmor -o "/etc/apt/trusted.gpg.d/${keyfilename}" && return 0 || sleep 10 + if ! curl -sSL --retry ${NET_RETRY_COUNT:-5} "$key_url" | sudo gpg --dearmor -o "/etc/apt/trusted.gpg.d/${keyfilename}"; then + echo "Failed downloading $keyfilename" + return 1 done - - return 1 # Failed } for key_url in "$@"; do