From: lace <>
Date: Fri, 18 Aug 2006 09:36:45 +0000 (+0000)
Subject: +Some diff(1) helpers.
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=8f972b0a2fd4adde9c74169099039ac62b40047c

+Some diff(1) helpers.
---

diff --git a/.bashrc b/.bashrc
index 3a68876..27dd64e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -144,6 +144,7 @@ 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'
 
 # '2>/dev/null' to prevent: unalias: x: not found
 unalias 2>/dev/null cp	# -i
@@ -247,6 +248,8 @@ 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
 
 ulimit -S -c 0
 set +H
diff --git a/.diffi.list b/.diffi.list
new file mode 100644
index 0000000..d8549e4
--- /dev/null
+++ b/.diffi.list
@@ -0,0 +1,45 @@
+*~
+*.orig
+*.rej
+core
+core.[0-9]*
+TAGS
+tags
+ID
+.deps
+.libs
+*.[oa]
+*.l[oa]
+*.l[oa]T
+pod2htm[di].tmp
+errs*
+configure
+configure.scan
+config.guess
+config.status
+config.sub
+config.log
+config.cache
+confdefs.h
+conftest*
+autoh[0-9]*
+confcache
+config.rpath
+depcomp
+compile
+stamp-h
+stamp-h.in
+stamp-h1
+install-sh
+aclocal.m4
+autom4te.cache
+autom4te-*.cache
+mkinstalldirs
+libtool
+ltconfig
+ltmain.sh
+macros.dep
+POTFILES*
+*.gmo
+*.mo
+ChangeLog*