shell-user/oh-my-bash
1
0
Fork 0
mirror of https://github.com/ohmybash/oh-my-bash.git synced 2024-05-11 05:55:37 +00:00
Code Issues Projects Releases Wiki Activity

lib/grep.sh: fix expansion of GREP_OPTIONS

Browse Source 
Previously, only the first element of the array was expanded, which is
always the empty string, so the setting of GREP_OPTIONS was useless. Expand
the entire array.
This commit is contained in:
Reuben Thomas
2020-07-28 10:24:30 +01:00
committed by Koichi Murase
parent 7ddf334013
commit 81fc5dd49d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/grep.sh
View File

@@ -4,24 +4,24 @@ grep_flag_available() {
echo | grep $1 "" >/dev/null 2>&1
}
GREP_OPTIONS=""
GREP_OPTIONS=()
# color grep results
if grep_flag_available --color=auto; then
GREP_OPTIONS+=( " --color=auto" )
GREP_OPTIONS+=( "--color=auto" )
fi
# ignore VCS folders (if the necessary grep flags are available)
VCS_FOLDERS="{.bzr,CVS,.git,.hg,.svn}"
if grep_flag_available --exclude-dir=.cvs; then
GREP_OPTIONS+=( " --exclude-dir=$VCS_FOLDERS" )
GREP_OPTIONS+=( "--exclude-dir=$VCS_FOLDERS" )
elif grep_flag_available --exclude=.cvs; then
GREP_OPTIONS+=( " --exclude=$VCS_FOLDERS" )
GREP_OPTIONS+=( "--exclude=$VCS_FOLDERS" )
fi
# export grep settings
alias grep="grep $GREP_OPTIONS"
alias grep="grep ${GREP_OPTIONS[*]}"
# clean up
unset GREP_OPTIONS