github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 04:06:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51819 from cblecker/godep-license-darwin

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51819, 51706, 51761, 51818, 51500)

Update godep-licenses script to work on darwin

**What this PR does / why we need it**:
When reviewing #51766, noticed that the godep licenses script has slightly different output on darwin (using the BSD md5sum) and linux (using the GNU md5sum).

This adds an awk trim to ensure that the output is the same on both platforms.

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-09-03 15:00:00 -07:00 committed by GitHub
commit 5735d80e53
2 changed files with 677 additions and 677 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1350
Godeps/LICENSES generated
View File

File diff suppressed because it is too large Load Diff

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

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