diff options
| author | Robby Russell <robby@planetargon.com> | 2014-12-14 16:31:54 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2014-12-14 16:31:54 -0800 |
| commit | 311f3630d4752139524941298371f9623d493b31 (patch) | |
| tree | 7bf20cf87de23d1528d23b5f42be867dc39dce30 | |
| parent | 8efdbef778335de51780af018af1d65e573775c4 (diff) | |
| parent | dd270878053a73600382de1c3592c04d985e5e08 (diff) | |
| download | zsh-311f3630d4752139524941298371f9623d493b31.tar.gz zsh-311f3630d4752139524941298371f9623d493b31.tar.bz2 zsh-311f3630d4752139524941298371f9623d493b31.zip | |
Merge pull request #3403 from mcornella/fix-grep-library
Fix grep.zsh library
| -rw-r--r-- | lib/grep.zsh | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/grep.zsh b/lib/grep.zsh index 276fec382..348ebe623 100644 --- a/lib/grep.zsh +++ b/lib/grep.zsh @@ -1,24 +1,24 @@ -# -# Color grep results -# Examples: http://rubyurl.com/ZXv -# - -GREP_OPTIONS="--color=auto" - -# avoid VCS folders (if the necessary grep flags are available) +# is x grep argument available? grep-flag-available() { echo | grep $1 "" >/dev/null 2>&1 } + +# color grep results +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 - for PATTERN in .cvs .git .hg .svn; do - GREP_OPTIONS+=" --exclude-dir=$PATTERN" - done + GREP_OPTIONS+=" --exclude-dir=$VCS_FOLDERS" elif grep-flag-available --exclude=.cvs; then - for PATTERN in .cvs .git .hg .svn; do - GREP_OPTIONS+=" --exclude=$PATTERN" - done + GREP_OPTIONS+=" --exclude=$VCS_FOLDERS" fi -unfunction grep-flag-available -export GREP_OPTIONS="$GREP_OPTIONS" -export GREP_COLOR='1;32' +# export grep settings +alias grep="grep $GREP_OPTIONS" + +# clean up +unset GREP_OPTIONS +unset VCS_FOLDERS +unfunction grep-flag-available |