github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #79314 from BenTheElder/licenses-osx

Browse Source 
fix hack/update-vendor-licenses.sh on macOS
This commit is contained in:
Kubernetes Prow Robot 2019-06-23 13:27:54 -07:00 committed by GitHub
commit fceec403ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/lib/util.sh
View File

@ -702,6 +702,15 @@ function kube::util::require-jq {
fi fi
} }
# outputs md5 hash of $1, works on macOS and Linux
function kube::util::md5() {
if which md5 >/dev/null 2>&1; then
md5 -q "$1"
else
md5sum "$1" | awk '{ print $1 }'
fi
}
# kube::util::read-array # kube::util::read-array
# Reads in stdin and adds it line by line to the array provided. This can be # Reads in stdin and adds it line by line to the array provided. This can be
# used instead of "mapfile -t", and is bash 3 compatible. # used instead of "mapfile -t", and is bash 3 compatible.

4
hack/update-vendor-licenses.sh
View File

@ -162,7 +162,7 @@ echo "= Kubernetes licensed under: ="
echo echo
cat "${LICENSE_ROOT}/LICENSE" cat "${LICENSE_ROOT}/LICENSE"
echo echo
echo "= LICENSE $(md5sum < "${LICENSE_ROOT}/LICENSE" | awk '{print $1}')" echo "= LICENSE $(kube::util::md5 "${LICENSE_ROOT}/LICENSE")"
echo "================================================================================" echo "================================================================================"
) > ${TMP_LICENSE_FILE} ) > ${TMP_LICENSE_FILE}
@ -211,7 +211,7 @@ __EOF__
cat "${file}" cat "${file}"
echo echo
echo "= ${file} $(md5sum < "${file}" | awk '{print $1}')" echo "= ${file} $(kube::util::md5 "${file}")"
echo "================================================================================" echo "================================================================================"
echo echo
done >> ${TMP_LICENSE_FILE} done >> ${TMP_LICENSE_FILE}