Merge pull request #34944 from jellonek/mac_compatible_copy

Automatic merge from submit-queue docs generation: Use macOS compatible copying method Replace option unknown for bsd version of `cp` used on macOS with compatible between systems replacement. Closes #34890 ```release-note NONE ```

Merge pull request #34944 from jellonek/mac_compatible_copy
62cc4319 · Kubernetes Submit Queue · GitHub · a5da5c09 · edd311f7 · 62cc4319
Commit 62cc4319 authored Oct 18, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

verify-generated-swagger-docs.sh hack/verify-generated-swagger-docs.sh +3 -3

No files found.
--- a/hack/verify-generated-swagger-docs.sh
+++ b/hack/verify-generated-swagger-docs.sh
@@ -49,14 +49,14 @@ trap "cleanup" EXIT SIGINT
 cleanup
-mkdir -p "${_tmp}"
+mkdir -p "${TMP_DIFFROOT}"
-cp -a -T "${DIFFROOT}" "${TMP_DIFFROOT}"
+cp -a "${DIFFROOT}"/* "${TMP_DIFFROOT}/"
 "${KUBE_ROOT}/hack/update-generated-swagger-docs.sh"
 echo "diffing ${DIFFROOT} against freshly generated swagger type documentation"
 ret=0
 diff -Naupr -I 'Auto generated by' "${DIFFROOT}" "${TMP_DIFFROOT}" || ret=$?
-cp -a -T "${TMP_DIFFROOT}" "${DIFFROOT}"
+cp -a "${TMP_DIFFROOT}"/* "${DIFFROOT}/"
 if [[ $ret -eq 0 ]]
 then
  echo "${DIFFROOT} up to date."