mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-11-03 23:40:03 +00:00 
			
		
		
		
	Run builds as the calling user
This means no 'sudo' is needed to copy files out.
This commit is contained in:
		@@ -38,20 +38,13 @@ for APIROOT in ${APIROOTS}; do
 | 
			
		||||
  cp -a "${KUBE_ROOT}/${APIROOT}" "${_tmp}/${APIROOT}"
 | 
			
		||||
done
 | 
			
		||||
 | 
			
		||||
# 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
 | 
			
		||||
  TMP_APIROOT="${_tmp}/${APIROOT}"
 | 
			
		||||
  echo "diffing ${APIROOT} against freshly generated protobuf"
 | 
			
		||||
  ret=0
 | 
			
		||||
  diff -Naupr -I 'Auto generated by' "${KUBE_ROOT}/${APIROOT}" "${TMP_APIROOT}" || ret=$?
 | 
			
		||||
  ${SUDO} cp -a "${TMP_APIROOT}" "${KUBE_ROOT}/${APIROOT%/*}"
 | 
			
		||||
  cp -a "${TMP_APIROOT}" "${KUBE_ROOT}/${APIROOT%/*}"
 | 
			
		||||
  if [[ $ret -eq 0 ]]; then
 | 
			
		||||
    echo "${APIROOT} up to date."
 | 
			
		||||
  else
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user