diff --git a/lib/git.sh b/lib/git.sh index 2ca5fe77ca3150a65cec9e8640ef2b6271efdc3d..5d3096ee2ddd4161d69be36b4ef885334caab312 100644 --- a/lib/git.sh +++ b/lib/git.sh @@ -217,4 +217,4 @@ function git_current_user_email() { # This is unlikely to change so make it all statically assigned #POST_1_7_2_GIT=$(git_compare_version "1.7.2") # Clean up the namespace slightly by removing the checker function -#unfunction git_compare_version +#unset -f git_compare_version diff --git a/lib/grep.sh b/lib/grep.sh deleted file mode 100644 index c3a219219079ef8073c55088b68616dd5147683f..0000000000000000000000000000000000000000 --- a/lib/grep.sh +++ /dev/null @@ -1,28 +0,0 @@ -# is x grep argument available? -grep-flag-available() { - echo | grep $1 "" >/dev/null 2>&1 -} - -GREP_OPTIONS="" - -# color grep results -if grep-flag-available --color=auto; then - GREP_OPTIONS+=" --color=auto" -fi - -# 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 - GREP_OPTIONS+=" --exclude-dir=$VCS_FOLDERS" -elif grep-flag-available --exclude=.cvs; then - GREP_OPTIONS+=" --exclude=$VCS_FOLDERS" -fi - -# export grep settings -alias grep="grep $GREP_OPTIONS" - -# clean up -unset GREP_OPTIONS -unset VCS_FOLDERS -#unfunction grep-flag-available