X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=.bashrc;h=9012b7738ffd289797248bae00f36c387b0de886;hb=597ebee58f5cf7aaae4c17704e763967a32583ab;hp=85ad212d6168d9949933762554869254280945b8;hpb=bcb953822c58417c6cb9f0f46a2570e695169859;p=nethome.git

diff --git a/.bashrc b/.bashrc
index 85ad212..9012b77 100644
--- a/.bashrc
+++ b/.bashrc
@@ -146,12 +146,18 @@ eval '
 	function cvsignoresallrm { cvsutil --ignores --workings --rm "$@"; }
 	function svnignoresall { svn status |sed -n "s/^[?]      //p" "$@"; }
 	function svnignoresallrm { svn status |sed -n "s/^[?]      //p"|tr "\n" "\0"|xargs -0 rm -rf "$@"; }
+	function ignores { find -name "*.orig" -o -name ".#*" -o -name "*~" "$@"; }
+	function ignoresrm { ignores "$@" | xargs rm -f; }
+	function ignoresall { ignores -o -name "*.rej" "$@"; }
+	function ignoresallrm { ignoresall "$@" | xargs rm -f; }
 	function disass { objdump -D --target=binary --architecture=i386 "$@"; }
 	function cal {(unset cal; ( cal -m "$@"; ); );}
 	function vncreadonly { vncviewer -FullColor -Shared -ViewOnly "$@"; }
 	function diff {(unset diff; ( diff -up "$@"; ); );}
-	function rpmbuildlocal { nice rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" "$@"; }
+	function rpmbuildlocal { nice rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" --define "_build_name_fmt %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" "$@"; rmdir &>/dev/null BUILDROOT; }
 	function gdbn { gdb -nx --command=~/.gdbinit "$@"; }
+	function hd { od -Ax -tx1; }
+	function wget {(unset wget; ( wget --no-check-certificate "$@"; ); );}
 '
 
 export IGNOREEOF=10
@@ -167,7 +173,7 @@ for file in $HOME/.bookmarks.html;do
 	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=CVS --exclude=ChangeLog* --exclude=*.svn-base"
+	export GREP_OPTIONS="$GREP_OPTIONS --exclude=tags --exclude=TAGS --exclude=CVS --exclude=ChangeLog* --exclude=*.svn-base --exclude=*~"
 	# FIXME: grep(1) ignores subdirectories for --exclude.
 	#export GREP_OPTIONS="$GREP_OPTIONS --exclude=testsuite --exclude=.pc --exclude=.svn"
 fi
@@ -183,6 +189,13 @@ export HISTSIZE=100000
 export HISTFILESIZE="$HISTSIZE"
 export GDBHISTFILE="$HOME/.gdb_history"
 export CVS_RSH="ssh"
+export TZ=":/usr/share/zoneinfo/Europe/Prague"
+MAKEFLAGS=
+cpus="`getconf _NPROCESSORS_ONLN`"
+if [ -n "$cpus" ];then
+	MAKEFLAGS="$MAKEFLAGS -j$[$cpus+1]"
+fi
+unset cpus
 # Do not: grep -w "$TERM" /etc/termcap >/dev/null || export TERM=vt220
 # as Sun workaround as Debian misses: /etc/termcap
 # expects: $uname_p
@@ -255,8 +268,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.$$; );}
-function diffc { diff -u "$@"|grep -v '^\(Only in \|Binary files\)'; }
-function diffi { diffc -X ~/.diffi.list "$@"; }
+function diffc { diff -up "$@"|grep -v '^\(Only in \|Binary files\)'; }
+function diffi { diffc -X ~/.diffi.list "$@" | diffdecvs; }
 function cvs {(unset cvs
 	local _opts _opts_d _now _line _o
 	_opts_d="-d"