mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-03-20 03:13:33 +01:00
Merge 15d529157f into 141c2e5934
This commit is contained in:
commit
df25bdd484
1 changed files with 10 additions and 8 deletions
18
lib/grep.zsh
18
lib/grep.zsh
|
|
@ -6,19 +6,21 @@
|
||||||
GREP_OPTIONS="--color=auto"
|
GREP_OPTIONS="--color=auto"
|
||||||
|
|
||||||
# avoid VCS folders (if the necessary grep flags are available)
|
# avoid VCS folders (if the necessary grep flags are available)
|
||||||
|
VCS_folders="{.bzr,.cvs,.git,.hg,.svn}"
|
||||||
|
|
||||||
grep-flag-available() {
|
grep-flag-available() {
|
||||||
echo | grep $1 "" >/dev/null 2>&1
|
echo | command grep $1 "" >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
if grep-flag-available --exclude-dir=.cvs; then
|
if grep-flag-available --exclude-dir=.cvs; then
|
||||||
for PATTERN in .cvs .git .hg .svn; do
|
GREP_OPTIONS+=" --exclude-dir=$VCS_folders"
|
||||||
GREP_OPTIONS+=" --exclude-dir=$PATTERN"
|
|
||||||
done
|
|
||||||
elif grep-flag-available --exclude=.cvs; then
|
elif grep-flag-available --exclude=.cvs; then
|
||||||
for PATTERN in .cvs .git .hg .svn; do
|
GREP_OPTIONS+=" --exclude=$VCS_folders"
|
||||||
GREP_OPTIONS+=" --exclude=$PATTERN"
|
|
||||||
done
|
|
||||||
fi
|
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'
|
||||||
|
|
||||||
|
|
||||||
|
# cleanup
|
||||||
|
unset VCS_folders
|
||||||
|
unfunction grep-flag-available
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue