From 5038fa69ac64c6c3835f76b5d09e4ebe8867ca9c Mon Sep 17 00:00:00 2001 From: Growl Date: Sat, 11 Jul 2026 17:25:43 +0800 Subject: [PATCH 1/2] Toolchain: Avoid flooding container logs with download progress --- toolchain/scripts/tool_kit.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/toolchain/scripts/tool_kit.sh b/toolchain/scripts/tool_kit.sh index 6f67628f967..3f5723606d8 100755 --- a/toolchain/scripts/tool_kit.sh +++ b/toolchain/scripts/tool_kit.sh @@ -922,12 +922,20 @@ download_pkg_from_url() { local __sha256="$1" # if set to "--no-checksum", do not check checksum local __filename="$2" local __url="$3" + + # Hide the progress bar in containers to prevent flooding output + local DOWNLOADER_FLAGS + if [ -f /.dockerenv ] || [ -f /run/.containerenv ]; then + DOWNLOADER_FLAGS="--quiet" + else + DOWNLOADER_FLAGS="--quiet --show-progress" + fi # Smart certificate validation strategy case "${DOWNLOAD_CERT_POLICY:-smart}" in "strict") echo "Downloading with strict certificate validation: $__url" - if ! wget --quiet --show-progress ${DOWNLOADER_FLAGS} "$__url" -O "$__filename"; then + if ! wget ${DOWNLOADER_FLAGS} "$__url" -O "$__filename"; then rm -f "$__filename" report_error "failed to download $__url (strict certificate validation)" recommend_offline_installation "$__filename" "$__url" @@ -938,7 +946,7 @@ download_pkg_from_url() { ;; "skip") echo "Downloading with certificate validation disabled: $__url" - if ! wget --quiet --show-progress ${DOWNLOADER_FLAGS} "$__url" -O "$__filename" --no-check-certificate; then + if ! wget ${DOWNLOADER_FLAGS} "$__url" -O "$__filename" --no-check-certificate; then rm -f "$__filename" report_error "failed to download $__url" recommend_offline_installation "$__filename" "$__url" @@ -950,7 +958,7 @@ download_pkg_from_url() { "smart"|*) # Smart fallback: try with certificate validation first, then without echo "Attempting secure download: $__url" - if wget --quiet --show-progress ${DOWNLOADER_FLAGS} "$__url" -O "$__filename"; then + if wget ${DOWNLOADER_FLAGS} "$__url" -O "$__filename"; then echo "Download successful with certificate validation" else echo "Certificate validation failed, retrying without certificate check..." From 940abddd3608f188dc0acd2459c094ca034660f1 Mon Sep 17 00:00:00 2001 From: Growl Date: Sat, 11 Jul 2026 22:12:05 +0800 Subject: [PATCH 2/2] Drop unused DOWNLOADER_FLAGS config cache from config_manager.sh --- toolchain/scripts/lib/config_manager.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/toolchain/scripts/lib/config_manager.sh b/toolchain/scripts/lib/config_manager.sh index 249e6515566..80eacd51969 100644 --- a/toolchain/scripts/lib/config_manager.sh +++ b/toolchain/scripts/lib/config_manager.sh @@ -390,7 +390,6 @@ config_set_defaults() { CONFIG_CACHE["TARGET_CPU"]="native" CONFIG_CACHE["LOG_LINES"]="200" CONFIG_CACHE["show_help"]="false" - CONFIG_CACHE["DOWNLOADER_FLAGS"]="" # Version strategy defaults (NEW) CONFIG_CACHE["VERSION_STRATEGY"]="main"