From 6b215055497803127633d3f9d2e3241980a8f9bf Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Mon, 9 Mar 2020 18:04:51 -0700 Subject: [PATCH] Replace raw usages of tar in build/lib/release.sh They broke the ability to run make quick-release on darwin. Use ${TAR} instead so that gtar can be used if available. --- build/lib/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/lib/release.sh b/build/lib/release.sh index 6d23dc20339..2a52b04e3d5 100644 --- a/build/lib/release.sh +++ b/build/lib/release.sh @@ -462,7 +462,7 @@ function kube::release::package_kube_manifests_tarball() { cp "${KUBE_ROOT}/cluster/gce/gci/health-monitor.sh" "${dst_dir}/health-monitor.sh" # Merge GCE-specific addons with general purpose addons. for d in cluster/addons cluster/gce/addons; do - find "${KUBE_ROOT}/${d}" \( \( -name \*.yaml -o -name \*.yaml.in -o -name \*.json \) -a ! \( -name \*demo\* \) \) -print0 | tar c --transform "s|${KUBE_ROOT#/*}/${d}||" --null -T - | "${TAR}" x -C "${dst_dir}" + find "${KUBE_ROOT}/${d}" \( \( -name \*.yaml -o -name \*.yaml.in -o -name \*.json \) -a ! \( -name \*demo\* \) \) -print0 | "${TAR}" c --transform "s|${KUBE_ROOT#/*}/${d}||" --null -T - | "${TAR}" x -C "${dst_dir}" done kube::release::clean_cruft @@ -528,7 +528,7 @@ function kube::release::package_test_tarballs() { # the portable test tarball. mkdir -p "${release_stage}/test/images" cp -fR "${KUBE_ROOT}/test/images" "${release_stage}/test/" - tar c "${KUBE_TEST_PORTABLE[@]}" | tar x -C "${release_stage}" + "${TAR}" c "${KUBE_TEST_PORTABLE[@]}" | "${TAR}" x -C "${release_stage}" kube::release::clean_cruft