From 8b973aa43affce72b78a40fcca1c091fc3ab4ff7 Mon Sep 17 00:00:00 2001 From: Laban Mwangi Date: Thu, 10 Apr 2014 12:36:08 +0200 Subject: [PATCH] Fix grep bug that breaks grep by passing unknown options to legacy grep versions --- lib/grep.zsh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/grep.zsh b/lib/grep.zsh index 977435ee4..1b6dd2829 100644 --- a/lib/grep.zsh +++ b/lib/grep.zsh @@ -5,9 +5,14 @@ # avoid VCS folders GREP_OPTIONS= -for PATTERN in .cvs .git .hg .svn; do - GREP_OPTIONS+="--exclude-dir=$PATTERN " -done +# --exclude-dir is only available on 2.5.3 and later versions of grep +if ! grep --version | head -n 1 | egrep " [0-2]\.[0-5]\.[0-2]" 2>&1 >/dev/null; +then + for PATTERN in .cvs .git .hg .svn; do + GREP_OPTIONS+="--exclude-dir=$PATTERN " + done +fi + GREP_OPTIONS+="--color=auto" export GREP_OPTIONS="$GREP_OPTIONS" export GREP_COLOR='1;32'