Merge pull request #1435 from ErikJiang/fix_airgap_patch

fix: airgap package build doesn't exit on error
kubean-io · Dec 11, 2024 · 85297d2 · 85297d2
2 parents bde2a02 + 0c83966
commit 85297d2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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)