summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMarc Cornellà <marc.cornella@live.com>2014-12-13 19:36:57 +0100
committerMarc Cornellà <marc.cornella@live.com>2014-12-13 19:52:49 +0100
commit711843153d6e53a89d37931217f59c4f6a3a35db (patch)
tree43ea5e91ffe92897d43a34e6c0b35b1745368c68 /lib
parent0190eb084bfb39bfa5920f85c2fc33730236217c (diff)
downloadzsh-711843153d6e53a89d37931217f59c4f6a3a35db.tar.gz
zsh-711843153d6e53a89d37931217f59c4f6a3a35db.tar.bz2
zsh-711843153d6e53a89d37931217f59c4f6a3a35db.zip
Tidy up the grep.zsh library
Diffstat (limited to 'lib')
-rw-r--r--lib/grep.zsh21
1 files changed, 11 insertions, 10 deletions
diff --git a/lib/grep.zsh b/lib/grep.zsh
index 06751db1a..4e55464c5 100644
--- a/lib/grep.zsh
+++ b/lib/grep.zsh
@@ -1,23 +1,24 @@
-#
-# Color grep results
-# Examples: http://rubyurl.com/ZXv
-#
+# is x grep argument available?
+grep-flag-available() {
+ echo | grep $1 "" >/dev/null 2>&1
+}
+# color grep results
GREP_OPTIONS="--color=auto"
-# avoid VCS folders (if the necessary grep flags are available)
+# ignore VCS folders (if the necessary grep flags are available)
VCS_FOLDERS="{.bzr,.cvs,.git,.hg,.svn}"
-grep-flag-available() {
- echo | command grep $1 "" >/dev/null 2>&1
-}
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
-unset VCS_FOLDERS
-unfunction grep-flag-available
+# export grep settings
export GREP_OPTIONS="$GREP_OPTIONS"
export GREP_COLOR='1;32'
+
+# clean up
+unset VCS_FOLDERS
+unfunction grep-flag-available