From 0c83966336fe773ab9abf74e626387777820114b Mon Sep 17 00:00:00 2001 From: "bo.jiang" Date: Wed, 11 Dec 2024 11:17:37 +0800 Subject: [PATCH] Clean up the TAR decompression process log & fix airgap package build issue Signed-off-by: bo.jiang --- artifacts/gen_airgap_pkgs.sh | 6 +++++- artifacts/import_files.sh | 2 +- artifacts/import_ospkgs.sh | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/artifacts/gen_airgap_pkgs.sh b/artifacts/gen_airgap_pkgs.sh index 9d1951bac..a08bb8ccf 100644 --- a/artifacts/gen_airgap_pkgs.sh +++ b/artifacts/gen_airgap_pkgs.sh @@ -71,7 +71,11 @@ function create_files() { sed -i -r "s#https?://#https://$mirror_host/#g" temp/files.list fi sed -i "s#storage.googleapis.com/kubernetes-release#dl.k8s.io#g" temp/files.list - NO_HTTP_SERVER=true bash manage-offline-files.sh + export NO_HTTP_SERVER=true + if ! bash ./manage-offline-files.sh; then + echo "Error: manage-offline-files.sh execution failed" + exit 1 + fi if [[ "${ZONE}" == "CN" ]]; then mv offline-files/$mirror_host/* offline-files/ rm -rf offline-files/$mirror_host offline-files.tar.gz diff --git a/artifacts/import_files.sh b/artifacts/import_files.sh index a0795e0cd..3e7e619b4 100755 --- a/artifacts/import_files.sh +++ b/artifacts/import_files.sh @@ -44,7 +44,7 @@ function check_mc_cmd() { function import_files() { if [ ! -d "offline-files" ]; then - tar -xvf offline-files.tar.gz + tar -xf offline-files.tar.gz echo "unzip successfully" fi diff --git a/artifacts/import_ospkgs.sh b/artifacts/import_ospkgs.sh index ead408071..608c7a362 100755 --- a/artifacts/import_ospkgs.sh +++ b/artifacts/import_ospkgs.sh @@ -51,7 +51,7 @@ function import_os_packages() { fi echo "$TAR_GZ_FILE_PATH" - tar -xvf "$TAR_GZ_FILE_PATH" ## got resources folder + tar -xf "$TAR_GZ_FILE_PATH" ## got resources folder for dirName in resources/*; do stderr=$(mc cp --quiet --no-color --recursive "$dirName" "kubeaniominioserver/kubean/" 2>&1 > /dev/null)