X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=f876225d71201c681bf11168781c7ee8641989d1;hp=6fc61afb32637988d6ce8a589868f19a19507fb1;hb=9e9d0a1f2d45c9d02a6c885f78415e44524ad205;hpb=0c732e77dd8a24fc2d91e15d63a6c6f828ab24d2

diff --git a/.bashrc b/.bashrc
index 6fc61af..f876225 100644
--- a/.bashrc
+++ b/.bashrc
@@ -97,13 +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"
 
-# /share/perl for Debian
-# /lib/perl for Debian
-# /lib/perl5 for Fedora Core
-mkdir -p $HOME/lib{64,}/perl5	# otherwise CPAN will install to "$HOME/lib{64,}/site_perl" etc.
-_perlpatt="$(perl -MConfig -e 'print "{,/".$Config{$_}."}" for qw(version archname);')"
-for _perldir in $(eval "echo {/usr,$HOME}{/lib{64,}/perl{,5},/share/perl}{,/site_perl}$_perlpatt");do
-	# $PERL5LIB overrides $PERLLIB and it is being used by: /etc/profile.d/atrpms.*
+for _perldir in $(eval "echo $HOME{/share,/lib{,64}}/perl5");do
 	_bash_profile_addpath -f PERL5LIB "$_perldir"
 	done
 unset _perldir
@@ -122,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
@@ -155,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; }
@@ -167,7 +162,7 @@ export IGNOREEOF=10
 [ -n "$SSH_TTY" ] && export TMOUT=900 2>/dev/null
 export EDITOR='vim'
 [ -x /bin/less ] && export PAGER='/bin/less -MMh5cis'
-export PERL_MM_OPT="PERL=$HOME/bin/perlilib"
+export PERL_MM_OPT=""
 [ "$UID" -ne 0 ] && export PERL_MM_OPT="$PERL_MM_OPT PREFIX=$HOME"
 for file in $HOME/.bookmarks.html;do
 	export WWW_HOME="file://$HOME/"
@@ -243,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
@@ -267,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" \
@@ -282,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
@@ -365,6 +360,7 @@ else
 	IONICE=""
 fi
 function n { if [ "$1" = "-p" ];then renice +19 "$@";test -n "$IONICE" && $IONICE "$@";else nice -n19 $IONICE "$@";fi };
+alias fetchmail='n fetchmail'
 function rpmsrclist
 {
 	if [ -z "$*" ]; then