Merge pull request #34946 from jellonek/macos_compatible_copying

Automatic merge from submit-queue utils: Use macOS copatible copying method Same as in #34944, releated to #34890 ```release-note NONE ```

Merge pull request #34946 from jellonek/macos_compatible_copying
a5da5c09 · Kubernetes Submit Queue · GitHub · b77e1344 · b45dfd5e · a5da5c09
Commit a5da5c09 authored Oct 18, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

verify-generated-protobuf.sh hack/verify-generated-protobuf.sh +2 -2

No files found.
--- a/hack/verify-generated-protobuf.sh
+++ b/hack/verify-generated-protobuf.sh
@@ -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