misc/alpine-tools.func

@@ -196,17 +196,11 @@ ensure_usr_local_bin_persist() {
 
 download_with_progress() {
   # $1 url, $2 dest
-  local url="$1" out="$2" content_length
+  local url="$1" out="$2" cl
   need_tool curl pv || return 1
-
+  cl=$(curl -fsSLI "$url" 2>/dev/null | awk 'tolower($0) ~ /^content-length:/ {print $2}' | tr -d '\r')
-  content_length=$(
+  if [ -n "$cl" ]; then
-    curl -fsSLI "$url" 2>/dev/null |
+    curl -fsSL "$url" | pv -s "$cl" >"$out" || {
-      awk '(tolower($1) ~ /^content-length:/) && ($2 + 0 > 0) {print $2+0}' |
-      tail -1 | tr -cd '[:digit:]' || true
-  )
-
-  if [ -n "$content_length" ]; then
-    curl -fsSL "$url" | pv -s "$content_length" >"$out" || {
       msg_error "Download failed: $url"
       return 1
     }

misc/tools.func

@@ -1692,11 +1692,7 @@ function download_with_progress() {
 
   # Content-Length aus HTTP-Header holen
   local content_length
-  content_length=$(
+  content_length=$(curl -fsSLI "$url" | awk '/Content-Length/ {print $2}' | tr -d '\r' || true)
-    curl -fsSLI "$url" 2>/dev/null |
-      awk '(tolower($1) ~ /^content-length:/) && ($2 + 0 > 0) {print $2+0}' |
-      tail -1 | tr -cd '[:digit:]' || true
-  )
 
   if [[ -z "$content_length" ]]; then
     if ! curl -fL# -o "$output" "$url"; then
@@ -6209,3 +6205,4 @@ function fetch_and_deploy_archive() {
   msg_ok "Successfully deployed archive to $directory"
   return 0
 }
+