grep: Fix F-21+: grep: warning: GREP_OPTIONS is deprecated; please use an alias or...

diff --git a/.bashrc b/.bashrc
index 5516f70..d01df08 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -162,7 +162,7 @@ export IGNOREEOF=10
 # '2>/dev/null' to prevent: TMOUT: readonly variable
 [ -n "$SSH_TTY" ] && export TMOUT=900 2>/dev/null
 export EDITOR='vim'
-[ -x /bin/less ] && export PAGER='/bin/less -rMMh5cis'
+#broken: [ -x /bin/less ] && export PAGER='/bin/less -rMMh5cis'
 
 export PERL_LOCAL_LIB_ROOT="$HOME/perl5";
 export PERL_MB_OPT="--install_base $HOME/perl5";
@@ -175,11 +175,10 @@ for file in $HOME/.bookmarks.html;do
        export WWW_HOME="file://$HOME/"
        [ -r $file ] && export WWW_HOME="file://$file"
        done
-export GREP_OPTIONS="--binary-files=without-match --directories=skip"
-if echo x|GREP_OPTIONS="--exclude=y" grep -q x 2>/dev/null;then
-       export GREP_OPTIONS="$GREP_OPTIONS --exclude=tags --exclude=TAGS --exclude=ChangeLog* --exclude=*.svn-base --exclude=*~"
+if echo x|grep --exclude=y -q x 2>/dev/null;then
+       alias grep='grep --exclude=tags --exclude=TAGS --exclude=ChangeLog* --exclude=*.svn-base --exclude=*~'
        # FIXME: grep(1) ignores subdirectories for --exclude.
-       #export GREP_OPTIONS="$GREP_OPTIONS --exclude=testsuite --exclude=.pc --exclude=.svn --exclude=CVS --exclude=po"
+       # --exclude=testsuite --exclude=.pc --exclude=.svn --exclude=CVS --exclude=po
 fi
 if [ -n "$PS1" ];then  # set only in interactive sessions
        if [ ! -f /MOCK ];then