Skip to content

refactor: use grep -E/-F instead of fgrep/egrep #102092

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.

Sign up for GitHub

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 2 commits into from
Oct 15, 2022
Merged

refactor: use grep -E/-F instead of fgrep/egrep #102092

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43bcc71
refactor: use grep -E/-F instead of fgrep/egrep
kxxt Sep 21, 2022
6135aff
simplify
kxxt Sep 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/etc/cat-and-grep.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Options:
-i Case insensitive search.
'

GREPPER=fgrep
GREPPER=grep
INVERT=0
GREPFLAGS='q'
while getopts ':vieh' OPTION; do
Expand All @@ -39,7 +39,7 @@ while getopts ':vieh' OPTION; do
GREPFLAGS="i$GREPFLAGS"
;;
e)
GREPPER=egrep
GREPFLAGS="E$GREPFLAGS"
;;
h)
echo "$USAGE"
Expand All @@ -51,6 +51,15 @@ while getopts ':vieh' OPTION; do
esac
done

# an utility function to check if a string contains a substring
stringContain() { [ -z "$1" ] || { [ -z "${2##*$1*}" ] && [ -n "$2" ];};}

if ! stringContain 'E' "$GREPFLAGS"
then
# use F flag if there is not an E flag
GREPFLAGS="F$GREPFLAGS"
fi

shift $((OPTIND - 1))

# use gnu version of tool if available (for bsd)
Expand Down