mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-12-21 03:41:57 +00:00
Merge pull request #3403 from mcornella/fix-grep-library
Fix grep.zsh library
This commit is contained in:
commit
311f3630d4
1 changed files with 20 additions and 20 deletions
40
lib/grep.zsh
40
lib/grep.zsh
|
@ -1,24 +1,24 @@
|
||||||
#
|
# is x grep argument available?
|
||||||
# Color grep results
|
|
||||||
# Examples: http://rubyurl.com/ZXv
|
|
||||||
#
|
|
||||||
|
|
||||||
GREP_OPTIONS="--color=auto"
|
|
||||||
|
|
||||||
# avoid VCS folders (if the necessary grep flags are available)
|
|
||||||
grep-flag-available() {
|
grep-flag-available() {
|
||||||
echo | grep $1 "" >/dev/null 2>&1
|
echo | grep $1 "" >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
if grep-flag-available --exclude-dir=.cvs; then
|
|
||||||
for PATTERN in .cvs .git .hg .svn; do
|
|
||||||
GREP_OPTIONS+=" --exclude-dir=$PATTERN"
|
|
||||||
done
|
|
||||||
elif grep-flag-available --exclude=.cvs; then
|
|
||||||
for PATTERN in .cvs .git .hg .svn; do
|
|
||||||
GREP_OPTIONS+=" --exclude=$PATTERN"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
unfunction grep-flag-available
|
|
||||||
|
|
||||||
export GREP_OPTIONS="$GREP_OPTIONS"
|
# color grep results
|
||||||
export GREP_COLOR='1;32'
|
GREP_OPTIONS="--color=auto"
|
||||||
|
|
||||||
|
# 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"
|
||||||
|
elif grep-flag-available --exclude=.cvs; then
|
||||||
|
GREP_OPTIONS+=" --exclude=$VCS_FOLDERS"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# export grep settings
|
||||||
|
alias grep="grep $GREP_OPTIONS"
|
||||||
|
|
||||||
|
# clean up
|
||||||
|
unset GREP_OPTIONS
|
||||||
|
unset VCS_FOLDERS
|
||||||
|
unfunction grep-flag-available
|
||||||
|
|
Loading…
Reference in a new issue