Skip to content

K
k3s
Commit b45dfd5e authored by Piotr Skamruk's avatar Piotr Skamruk
Browse files
Options

utils: Use macOS copatible copying method

Same as in #34944, releated to #34890
parent 40e1aa6b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
hack/verify-generated-protobuf.sh
View file @ b45dfd5e
......@@ -35,7 +35,7 @@ trap "cleanup" EXIT SIGINT
cleanup
for APIROOT in ${APIROOTS}; do
mkdir -p "${_tmp}/${APIROOT}"
cp -a -T "${KUBE_ROOT}/${APIROOT}" "${_tmp}/${APIROOT}"
cp -a "${KUBE_ROOT}/${APIROOT}"/* "${_tmp}/${APIROOT}/"
done
KUBE_VERBOSE=3 "${KUBE_ROOT}/hack/update-generated-protobuf.sh"
......@@ -44,7 +44,7 @@ for APIROOT in ${APIROOTS}; do
echo "diffing ${APIROOT} against freshly generated protobuf"
ret=0
diff -Naupr -I 'Auto generated by' -x 'zz_generated.*' "${KUBE_ROOT}/${APIROOT}" "${TMP_APIROOT}" || ret=$?
cp -a -T "${TMP_APIROOT}" "${KUBE_ROOT}/${APIROOT}"
cp -a "${TMP_APIROOT}"/* "${KUBE_ROOT}/${APIROOT}/"
if [[ $ret -eq 0 ]]; then
echo "${APIROOT} up to date."
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment