Skip to content

Commit

Permalink
Merge pull request kubernetes#34944 from jellonek/mac_compatible_copy
Browse files Browse the repository at this point in the history
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 kubernetes#34890

```release-note
NONE
```
  • Loading branch information
Kubernetes Submit Queue authored Oct 18, 2016
2 parents a5da5c0 + edd311f commit 62cc431
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions hack/verify-generated-swagger-docs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ trap "cleanup" EXIT SIGINT

cleanup

mkdir -p "${_tmp}"
cp -a -T "${DIFFROOT}" "${TMP_DIFFROOT}"
mkdir -p "${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."
Expand Down

0 comments on commit 62cc431

Please sign in to comment.