Fix add-apt-repositories.sh & add-apt-keys

The loop syntax was wrong, so fix or remove it
(curl already has the retry option)

Also add retry and failed messages

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
-    done
-
-    return 1 # Failed
+    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
+    fi
 }
 
 for key_url in "$@"; do

ci/add-apt-repositories.sh

@@ -14,9 +14,16 @@ set -eu
 function do_add_repository {
     name=$1
     echo -e "\tAdding repository $name"
-    for i in {1..${NET_RETRY_COUNT:-3}}; do
-        sudo -E apt-add-repository -y "$name" && return 0 || sleep 10;
+    for i in $(seq ${NET_RETRY_COUNT:-3}); do
+        if [[ $i -ne 1 ]]; then
+            sleep 10
+            echo -e "\tRetrying"
+        fi
+        if sudo -E apt-add-repository -y "$name"; then
+            return 0
+        fi
     done
+    echo "Failed adding $name"
     return 1 # Failed
 }