Merge pull request #2650 from kemko/patch-1
don't add --exclude-dir to GREP_OPTIONS on FreeBSD
This commit is contained in:
commit
8aa6e6a412
23
lib/grep.zsh
23
lib/grep.zsh
|
@ -3,11 +3,22 @@
|
|||
# Examples: http://rubyurl.com/ZXv
|
||||
#
|
||||
|
||||
# avoid VCS folders
|
||||
GREP_OPTIONS=
|
||||
for PATTERN in .cvs .git .hg .svn; do
|
||||
GREP_OPTIONS+="--exclude-dir=$PATTERN "
|
||||
done
|
||||
GREP_OPTIONS+="--color=auto"
|
||||
GREP_OPTIONS="--color=auto"
|
||||
|
||||
# avoid VCS folders (if the necessary grep flags are available)
|
||||
grep-flag-available() {
|
||||
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"
|
||||
export GREP_COLOR='1;32'
|
||||
|
|
Loading…
Reference in New Issue