From 83ac3ea0c9a7c11fb133b3e757a04b6d766870dd Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Mon, 2 May 2016 15:00:28 -0700 Subject: [PATCH] Make comment explain why we need sudo Also make the check more correct and quieter. --- hack/after-build/verify-generated-protobuf.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/hack/after-build/verify-generated-protobuf.sh b/hack/after-build/verify-generated-protobuf.sh index 0582c155c9c..965b8cefe04 100755 --- a/hack/after-build/verify-generated-protobuf.sh +++ b/hack/after-build/verify-generated-protobuf.sh @@ -36,10 +36,12 @@ for APIROOT in ${APIROOTS}; do cp -a "${KUBE_ROOT}/${APIROOT}" "${_tmp}/${APIROOT}" done -# We would like to use "sudo" when running on Travis and -# not use "sudo" when running on Jenkins. -SUDO="sudo" -sudo -h > /dev/null || SUDO="" +# If not running as root, we need to use sudo to restore the original generated +# protobuf files. +SUDO="" +if [[ "$(id -u)" != '0' ]]; then + SUDO="sudo" +fi "${KUBE_ROOT}/hack/update-generated-protobuf.sh" for APIROOT in ${APIROOTS}; do