Skip to content

Portable make update-hashes. #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2018
Merged

Conversation

ijc
Copy link
Contributor

@ijc ijc commented Jan 30, 2018

MacOS lacks xargs' --no-run-if-empty option. Since the git grep always
matches at least one file it's not really needed.

However since the files which need patching are just those under yml/ which are
small enough in number and size that we can just unconditionally apply the
update to the all.

Fixes #52.

Signed-off-by: Ian Campbell [email protected]

MacOS lacks `xargs`' `--no-run-if-empty` option. Since the `git grep` always
matches at least one file it's not really needed.

However since the files which need patching are just those under yml/ which are
small enough in number and size that we can just unconditionally apply the
update to the all.

Fixes linuxkit#52.

Signed-off-by: Ian Campbell <[email protected]>
@ijc ijc merged commit 22280f1 into linuxkit:master Jan 30, 2018
@ijc ijc deleted the portable-hash-updates branch January 30, 2018 11:41
ijc pushed a commit to ijc/linuxkit-kubernetes that referenced this pull request Jan 30, 2018
While linuxkit#55 fixed the issue with `xargs` it did not fix the `sed` expression to
work on MacOS. Do so by enabling extended regular expressions (`-E`) and
adjusting the expression, this now works on both Linux (GNU sed 4.4) and on
MacOS (system `sed` from FreeBSD).

This properly fixes linuxkit#52.

Signed-off-by: Ian Campbell <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants