From 5b3df16469638ba367b148f5e22972f2d4acd478 Mon Sep 17 00:00:00 2001 From: Dan Porter Date: Tue, 1 Apr 2014 15:32:06 +0100 Subject: [PATCH] Add exclude-dir option only if grep supports it Older versions of grep pre 2.5.2 did not have this option. Providing it breaks grep use under oh-my-zsh on these systems. This patch adds a check to ensure the option is only used if the manpages list it. --- lib/grep.zsh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/grep.zsh b/lib/grep.zsh index 977435ee4..49c156a69 100644 --- a/lib/grep.zsh +++ b/lib/grep.zsh @@ -3,11 +3,13 @@ # Examples: http://rubyurl.com/ZXv # -# avoid VCS folders +# avoid VCS folders if grep supports it GREP_OPTIONS= -for PATTERN in .cvs .git .hg .svn; do - GREP_OPTIONS+="--exclude-dir=$PATTERN " -done +if [[ "$(man grep | grep -q exclude-dir)" != "1" ]]; 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'