Skip to content

Commit 82f3f33

Browse files
committed
Simplify and improve find/tar lines
Signed-off-by: Joakim Roubert <[email protected]>
1 parent b69a386 commit 82f3f33

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

build/lib/release.sh

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function kube::release::package_src_tarball() {
112112
git archive -o "${src_tarball}" HEAD
113113
else
114114
find "${KUBE_ROOT}" -mindepth 1 -maxdepth 1 \
115-
-not \( \
115+
! \( \
116116
\( -path "${KUBE_ROOT}"/_\* -o \
117117
-path "${KUBE_ROOT}"/.git\* -o \
118118
-path "${KUBE_ROOT}"/.config\* -o \
@@ -348,7 +348,6 @@ function kube::release::create_docker_images_for_server() {
348348
local images_dir
349349
binary_dir="$1"
350350
arch="$2"
351-
binary_name
352351
binaries=$(kube::build::get_docker_wrapped_binaries "${arch}")
353352
images_dir="${RELEASE_IMAGES}/${arch}"
354353
mkdir -p "${images_dir}"
@@ -466,15 +465,10 @@ function kube::release::package_kube_manifests_tarball() {
466465
cp "${KUBE_ROOT}/cluster/gce/gci/gke-internal-configure-helper.sh" "${dst_dir}/"
467466
fi
468467
cp "${KUBE_ROOT}/cluster/gce/gci/health-monitor.sh" "${dst_dir}/health-monitor.sh"
469-
local objects
470-
objects=$(cd "${KUBE_ROOT}/cluster/addons" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) | grep -v demo)
471-
tar c -C "${KUBE_ROOT}/cluster/addons" "${objects}" | tar x -C "${dst_dir}"
472468
# Merge GCE-specific addons with general purpose addons.
473-
local gce_objects
474-
gce_objects=$(cd "${KUBE_ROOT}/cluster/gce/addons" && find . \( -name \*.yaml -or -name \*.yaml.in -or -name \*.json \) \( -not -name \*demo\* \))
475-
if [[ -n ${gce_objects} ]]; then
476-
tar c -C "${KUBE_ROOT}/cluster/gce/addons" "${gce_objects}" | tar x -C "${dst_dir}"
477-
fi
469+
for d in cluster/addons cluster/gce/addons; do
470+
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}"
471+
done
478472

479473
kube::release::clean_cruft
480474

0 commit comments

Comments
 (0)