Support svn(1) diffing "-p" by default.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 3a68876..76f0d10 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -140,10 +140,13 @@ alias cvsignoresrm='cvsutil --ignores --rm'
 alias cvsignoresrmall='cvsutil --ignores --workings --rm'
 alias cvsignoresallrm='cvsutil --ignores --workings --rm'
 [ "`uname`" = "SunOS" -a -x $HOME/bin/rpm-by-pkg ] && alias rpm='rpm-by-pkg'
-alias rpmdb='rpm --define "_dbpath `echo /usr/lib/rpmdb/*/*`"'
 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'
 
 # '2>/dev/null' to prevent: unalias: x: not found
 unalias 2>/dev/null cp # -i
@@ -231,11 +234,14 @@ function mi { (
        ); };export -f mi
 function ctags {(unset ctags;
        if [ $# -ne 0 -a '(' $# -ne 1 -o "$1" '!=' "--c-types=+px" ')' ];then ctags "$@";else
-               find -type f -a '!' -name tags -a '!' -name TAGS -a '(' -false \
+               find -name testsuite -prune -o \
+                               -type f -a '!' -name tags -a '!' -name TAGS -a '(' -false \
                                                -o -name "*.[chC]" \
                                                -o -name "*.cc"    \
+                                               -o -name "*.cxx"   \
                                                -o -name "*.java"  \
                                                -o -name "*.p[lm]" \
+                                               -o -name "*.py" \
                                                ')' \
                                |ctags --file-tags -L - "$@"
        fi; );}; export -f ctags
@@ -247,6 +253,25 @@ function debuginfo { if test -n "$*";then echo "$*";else cat;fi \
        |xargs rpm -qf|xargs rpmquery --qf '%{SOURCERPM}\n'|sed 's/-[^-]*-[^-]*[.]src[.]rpm$/-debuginfo/'|sort -u; }
 function ipcsrmall { ipcs|awk '/- Shared Memory/{x="-m"}/- Semaphore/{x="-s"}/^0x/{print "ipcrm "x" "$2}'; }
 function eog {(unset eog; touch /tmp/eog.$$;eog "$@" {,,,,,,,,,}/tmp/eog.$$;rm -f /tmp/eog.$$; );}; export -f eog
+function diffc { diff -u "$@"|grep -v '^\(Only in \|Binary files\)'; }; export -f diffc
+function diffi { diffc -X ~/.diffi.list "$@"; }; export -f diffi
+function cvs {(unset cvs;
+       local _opts _opts_d _now _line _o
+       if grep -iw "sources.redhat.com:/cvs/src" CVS/Root &>/dev/null;then _opts_d="";else _opts_d="-d";fi
+       _now=false
+       _line=""
+       _opts=""
+       while [ $# != 0 ];do
+               _o="$1"
+               shift
+               _line="$_line $_o"
+               if [ "$_o" = "--" ] && ! $_now;then _now=true;continue;fi
+               if [ "${_o#-}" != "$_o" ] && ! $_now;then continue;fi
+               if [ "$_o" = update -o "$_o" = upd -o "$_o" = up ];then _opts="$_opts_d";fi
+               break
+               done
+       cvs $_line $_opts "$@"
+       ); }; export -f cvs
 
 ulimit -S -c 0
 set +H