Use simpler method to detect binaries #12964
Merged
Conversation
This file contains 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
|
Review period will end on 2022-03-08 at 00:00:00 UTC. |
BrewTestBot
added
the
waiting for feedback
MikeMcQuaid
approved these changes
Mar 7, 2022
BrewTestBot
removed
the
waiting for feedback
|
Review period ended. |
BrewTestBot
approved these changes
Mar 8, 2022
danielnachun
force-pushed
the
new_binary_grep
branch
from
6bbb203
to
0128192
Compare
MikeMcQuaid
approved these changes
Mar 9, 2022
There was a problem hiding this comment.
Two optional style suggestions, feel free to ship as-is or after those have been applied. Thanks @danielnachun!
Library/Homebrew/keg_relocate.rb
Outdated
Comment on lines
180
to
182
| grep_args = ["--files-with-matches", | ||
| "--perl-regexp", | ||
| "--binary-files=text"] |
There was a problem hiding this comment.
Suggested change
| grep_args = ["--files-with-matches", | |
| "--perl-regexp", | |
| "--binary-files=text"] | |
| grep_args = [ | |
| "--files-with-matches", | |
| "--perl-regexp", | |
| "--binary-files=text", | |
| ] |
just if we decide to add/remove this later to make the diff nicer.
Library/Homebrew/keg_relocate.rb
Outdated
| Utils.popen_read(grep_bin, grep_args, NULL_BYTE_STRING, to_s) do |io| | ||
| each_unique_file(io, block) | ||
| end | ||
| Utils.popen_read(grep_bin, *grep_args, NULL_BYTE_STRING, file).size.positive? |
There was a problem hiding this comment.
Suggested change
| Utils.popen_read(grep_bin, *grep_args, NULL_BYTE_STRING, file).size.positive? | |
| Utils.popen_read(grep_bin, *grep_args, NULL_BYTE_STRING, file).present? |
danielnachun
force-pushed
the
new_binary_grep
branch
from
0128192
to
1faa444
Compare
|
I made the style changes and am merging now. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
We discussed here: https://github.com/Homebrew/brew/pull/12940/files#r818284011 that it is much simpler to use
grepto check if an individual file contains null bytes than to iterate over all files in the keg. We are only interested in checking files which we already know contain prefixes, which we can pass in as an argument. This method could also be useful in the future if we need to determine if files are binaries in other situations.I also reverted
each_unique_file_matchingback to its original state. If we think it's better to still have a genericeach_unique_filemethod that is called byeach_unique_file_matching, that's totally fine with me. At the moment onlyeach_unique_file_matchingwould need to calleach_unique_file, but it's possible some future methods could also useeach_unique_fileas well.