mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-22 05:40:08 +00:00
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
1 changed files with 17 additions and 6 deletions
23
lib/grep.zsh
23
lib/grep.zsh
|
@ -3,11 +3,22 @@
|
||||||
# Examples: http://rubyurl.com/ZXv
|
# Examples: http://rubyurl.com/ZXv
|
||||||
#
|
#
|
||||||
|
|
||||||
# avoid VCS folders
|
GREP_OPTIONS="--color=auto"
|
||||||
GREP_OPTIONS=
|
|
||||||
for PATTERN in .cvs .git .hg .svn; do
|
# avoid VCS folders (if the necessary grep flags are available)
|
||||||
GREP_OPTIONS+="--exclude-dir=$PATTERN "
|
grep-flag-available() {
|
||||||
done
|
echo | grep $1 "" >/dev/null 2>&1
|
||||||
GREP_OPTIONS+="--color=auto"
|
}
|
||||||
|
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_OPTIONS="$GREP_OPTIONS"
|
||||||
export GREP_COLOR='1;32'
|
export GREP_COLOR='1;32'
|
||||||
|
|
Loading…
Reference in a new issue