X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=da4df3af8f996ae9518355673a0d6c69760454ba;hp=96d7d3585c972870ca86b8b597f70fbc05398db8;hb=f1fd1da97405a124a824d3808d6bc59df1b16b9b;hpb=ce4cd1bc7ff54ba7f0f69404970418cb09260cf9

diff --git a/.bashrc b/.bashrc
index 96d7d35..da4df3a 100644
--- a/.bashrc
+++ b/.bashrc
@@ -97,7 +97,7 @@ _bash_profile_addpath    -s CVSROOT "$HOME/pserver/cvs"
 _bash_profile_addpath    -s CVSROOT "$HOME/cvs"
 _bash_profile_addpath    -s ANT_HOME "/usr/local/ant"
 
-for _perldir in $(eval "echo $HOME{/share,/lib{,64}}/perl5");do
+for _perldir in $(eval "echo $HOME{/share,/lib{,64}}/perl5{/site_perl,}");do
 	_bash_profile_addpath -f PERL5LIB "$_perldir"
 	done
 unset _perldir
@@ -116,11 +116,12 @@ unalias 2>/dev/null du	# -h
 unalias 2>/dev/null ls	# --color=auto
 unalias 2>/dev/null l.	# ls -d .* --color=auto
 unalias 2>/dev/null ll	# ls -l --color=auto
+unalias 2>/dev/null grep	# grep --color=auto
 
-# Aliases would get processed during the parsing of this script file!
+# Prevent processing of aliases during the parsing of this script file by
+# `eval':
 eval '
 	function grep {(unset grep; ( ulimitme; grep "$@"; ); );}
-
 	function ls {(unset ls; ( ls -bF "$@"; ); );}
 	function l { ls -lbF "$@"; }
 	if which vim &>/dev/null;then
@@ -149,7 +150,7 @@ eval '
 	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 diff {(unset diff; ( diff -dup "$@"; ); );}
 	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; }
@@ -237,13 +238,12 @@ for i in "-m 100000" "-d 150000" "-v 200000";do
 # Prevent: ulimit:  -m 100000 -d 150000 -v 200000: invalid number
 # by forcing our known $IFS value; eval(1) is needed to take $IFS to effect:
 function ulimitme { IFS=" " eval "ulimit $ULIMITME_OPTS"; }
-function grep {(unset grep; ( ulimitme; grep "$@"; ); );}
 function finame { find . -false `
 	awk </dev/null 'BEGIN{ for (i=1;i<ARGC;i++) print " -o -iname *"ARGV[i]"*"; }' "$@"
 	`; }
 function mkcd { mkdir -p "$1"; cd "$1"; }
 function pushdmk { mkdir -p "$1"; pushd "$1"; }
-function rsync {(unset rsync; nice -n20 rsync -v -e ssh --progress --stats --inplace --rsync-path='nice -n20 rsync' "$@"; );}
+function rsync {(unset rsync; nice -n20 rsync -v -e ssh --progress --stats --inplace --rsync-path='nice -n20 ionice -c3 rsync' "$@"; );}
 function tohex { od -An -txC|tr -d '\n '|tr 'a-f' 'A-F';echo; }
 function edall {
 	find -type f|while read -r i;do
@@ -261,6 +261,7 @@ function ctags {(unset ctags
 						-o -name "*.cc"    \
 						-o -name "*.cxx"   \
 						-o -name "*.cpp"   \
+						-o -name "*.[Ss]"  \
 						-o -name "*.java"  \
 						-o -name "*.p[lm]" \
 						-o -name "*.py" \
@@ -276,7 +277,7 @@ 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 -up "$@"|grep -v '^\(Only in \|Binary files\)'; }
+function diffc { diff -dup "$@"|grep -v '^\(Only in \|Binary files\)'; }
 function diffi { diffc -X ~/.diffi.list "$@" | diffdecvs; }
 function cvs {(unset cvs
 	local _opts _opts_d _now _line _o
@@ -387,7 +388,7 @@ function rpmsrclist
 			| sort -u
 	fi
 }
-function valgrind {(set -e;unset valgrind;s=~/.python.valgrind;rm -f $s;cp -p /usr/share/doc/python-devel-2.*/valgrind-python.supp $s;patch $s <$s.patch;perl -i -e 'undef $/;$_=<>;1 while s/^(?:###)?({\n)(?:###)?( *ADDRESS_IN_RANGE.*\n(?:[^}#].*\n)*)###/$1$2/gm;print;' $s;valgrind --suppressions=$s "$@";);}
+function valgrind {(set -e;unset valgrind;s=~/.python.valgrind;rm -f $s;cp -p /usr/share/doc/python-devel-2.*/valgrind-python.supp $s;patch $s <$s.patch;perl -i -e 'undef $/;$_=<>;1 while s/^(?:###)?({\n)(?:###)?( *ADDRESS_IN_RANGE.*\n(?:[^}#].*\n)*)###/$1$2/gm;print;' $s;valgrind --num-callers=50 --suppressions=$s "$@";);}
 function yumupdate {(ulimit -v unlimited;yum makecache;yum -y --skip-broken update "$@";);}
 
 ulimit -S -c 0