Make `rpmqf' default.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index ec98198..ca689c4 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -151,7 +151,6 @@ alias disass='objdump -D --target=binary --architecture=i386'
 alias cal='cal -m'
 alias vncreadonly='vncviewer -FullColor -Shared -ViewOnly'
 alias diff='diff -u'
-alias rpmqf='rpm --qf "%{name}-%{version}-%{release}.%{arch}\n"'
 alias rpmbuildlocal='rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD"'
 alias gdbn='gdb -nx --command=~/.gdbinit'
 
@@ -173,7 +172,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 --exclude=tags --exclude=TAGS --exclude=CVS"
+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=CVS"
+fi
 if [ -n "$PS1" ];then  # set only in interactive sessions
        export PS1='[bash]${LOGNAME}@${HOSTNAME}:${PWD}# '
        export PS1='\[\017\]'"$PS1"     # \017=std charmap