github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

utils: Use macOS copatible copying method

Browse Source 
Same as in #34944, releated to #34890
This commit is contained in:
Piotr Skamruk
2016-10-17 14:14:43 +02:00
parent 40e1aa6b25
commit b45dfd5e8f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hack/verify-generated-protobuf.sh
View File

@@ -35,7 +35,7 @@ trap "cleanup" EXIT SIGINT
cleanup cleanup
for APIROOT in ${APIROOTS}; do for APIROOT in ${APIROOTS}; do
mkdir -p "${_tmp}/${APIROOT}" mkdir -p "${_tmp}/${APIROOT}"
cp -a -T "${KUBE_ROOT}/${APIROOT}" "${_tmp}/${APIROOT}" cp -a "${KUBE_ROOT}/${APIROOT}"/* "${_tmp}/${APIROOT}/"
done done
KUBE_VERBOSE=3 "${KUBE_ROOT}/hack/update-generated-protobuf.sh" 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" echo "diffing ${APIROOT} against freshly generated protobuf"
ret=0 ret=0
diff -Naupr -I 'Auto generated by' -x 'zz_generated.*' "${KUBE_ROOT}/${APIROOT}" "${TMP_APIROOT}" || ret=$? 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 if [[ $ret -eq 0 ]]; then
echo "${APIROOT} up to date." echo "${APIROOT} up to date."
else else