This repository has been archived by the owner on Oct 2, 2024. It is now read-only.
Mksquashfs quiet using '-quiet' flag #1921
Open
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
…the '-quiet' flag in the mksquashfs help menu, meaning that mksquashf is version 4.4 or higher.
Closed
reidpr
reviewed
Sep 11, 2024
bin/ch-convert
Outdated
| @@ -116,8 +116,14 @@ cv_dir_squash () { | |||
| # Exclude build cache metadata. 64kiB block size based on Shane’s | |||
| # experiments. | |||
| # shellcheck disable=SC2086 | |||
| quiet mksquashfs "$1" "$2" $squash_xattr_arg -b 65536 -noappend -all-root \ | |||
| -pf "$pflist" -e "$1"/ch/git -e "$1"/ch/git.pickle | |||
| if mksquashfs --help 2>&1 | grep "quiet"; then | |||
There was a problem hiding this comment.
Here I think you want to tighten up the grep(1) a bit, specifically:
Suggested change
| if mksquashfs --help 2>&1 | grep "quiet"; then | |
| if mksquashfs --help 2>&1 | egrep -q '^-quiet'; then |
the changes being:
grep→egrep: use “extended” regular expressions which really just means “horrible syntax” instead of “incomprehensibly horrible syntax”. In my view one should only everfgrep(1)for string matching oregrep(1)for regex matching.- The carat means match only at the beginning of a line.
- Match the option itself, without false positives if the help says the word “quiet” somewhere.
-q: Don’t print matching lines, since we only care about the presence or absence of a match.- Single quotes because we don’t want to expand shell variables.
reidpr
reviewed
Sep 11, 2024
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.
Fixes #1210
Uses the '-quiet' flag on mksquashfs.
If the grep cmd is able to find the '-quiet' flag in the mksquashfs help menu, then we use the '-quiet' flag because this flag is only available on mksquashf version 4.4 or higher.