Portable make update-hashes.
#55
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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]>
rn
approved these changes
Jan 30, 2018
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
MacOS lacks
xargs'--no-run-if-emptyoption. Since thegit grepalwaysmatches 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]