feat: Limit wget progress output (#1866)

This commit is contained in:
Kroese
2026-07-15 23:02:29 +02:00
committed by GitHub
parent 55ac87c0c4
commit 378312cfa4
+11 -6
View File
@@ -772,8 +772,10 @@ downloadFile() {
local desc="$6" local desc="$6"
local reason="" local reason=""
local msg="Downloading $desc" local msg="Downloading $desc"
local rc total total_gb progress log local rc total total_gb log
local domain dots agent space folder local domain dots agent space folder
local progress=()
local dotbytes=33554432
agent=$(getAgent) agent=$(getAgent)
@@ -792,13 +794,16 @@ downloadFile() {
# Check if running with interactive TTY or redirected to docker log # Check if running with interactive TTY or redirected to docker log
if [ -t 1 ]; then if [ -t 1 ]; then
progress="--progress=bar:noscroll" progress=( --progress=bar:noscroll )
else else
progress="--progress=dot:giga" if [[ "$size" =~ ^[0-9]+$ ]] && (( size > 0 )); then
dotbytes=$(( (size + 199) / 200 ))
fi
progress=( --progress=dot --execute "dotbytes=$dotbytes" )
fi fi
html "$msg..." html "$msg..."
/run/progress.sh "$iso" "$size" "$msg ([P])..." & /run/progress.sh "$iso" "${size:-0}" "$msg ([P])..." &
domain=$(echo "$url" | awk -F/ '{print $3}') domain=$(echo "$url" | awk -F/ '{print $3}')
dots=$(echo "$domain" | tr -cd '.' | wc -c) dots=$(echo "$domain" | tr -cd '.' | wc -c)
@@ -814,8 +819,8 @@ downloadFile() {
{ {
LC_ALL=C wget "$url" -O "$iso" --continue --no-verbose --timeout=30 \ LC_ALL=C wget "$url" -O "$iso" --continue --no-verbose --timeout=30 \
--no-http-keep-alive --user-agent "$agent" --show-progress "$progress" \ --no-http-keep-alive --user-agent "$agent" --show-progress \
--output-file="$log" "${progress[@]}" --output-file="$log"
rc=$? rc=$?
} || : } || :