From 0bd3c9996fa58494fbefaad483abbe60ed332889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Sat, 13 Dec 2014 19:13:27 +0100 Subject: [PATCH] Extract VCS folders definition to avoid repetition --- lib/grep.zsh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/grep.zsh b/lib/grep.zsh index 276fec382..ad38ec6fc 100644 --- a/lib/grep.zsh +++ b/lib/grep.zsh @@ -6,18 +6,17 @@ GREP_OPTIONS="--color=auto" # avoid VCS folders (if the necessary grep flags are available) +VCS_FOLDERS="{.cvs,.git,.hg,.svn}" + grep-flag-available() { echo | grep $1 "" >/dev/null 2>&1 } 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 +unset VCS_FOLDERS unfunction grep-flag-available export GREP_OPTIONS="$GREP_OPTIONS"