X-Git-Url: http://git.jankratochvil.net/?a=blobdiff_plain;f=.bashrc;h=c1a83bc0a96c5ce4255a3efd641e0989d57e6fcf;hb=543605c104551716f71223ed944e1fb5b1eb4a4f;hp=10d185260be9838782f7d4ca78b59332ea18d133;hpb=22a13978650131583b5ffc4cff385e812f7bd9c2;p=nethome.git

diff --git a/.bashrc b/.bashrc
index 10d1852..c1a83bc 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,9 +1,12 @@
+if [ -z "$_home_short_dotbashrc" ];then
+	_home_short_dotbashrc=true
+
 if [ -f /etc/bashrc ];then source /etc/bashrc;fi
 
 function _bash_profile_addpath	# variable,dirpathname
 {
 	if [ '!' -d "$2" ];then return;fi
-	if [ -z "`eval "echo \\${$1}"`" ];then
+	if [ -n "$3" -o -z "`eval "echo \\${$1}"`" ];then
 		eval "$1='$2'"
 	else
 		# we want to override any original directories, place dirpathname first!
@@ -13,11 +16,25 @@ function _bash_profile_addpath	# variable,dirpathname
 }
 
 _bash_profile_addpath PATH            "$HOME/bin"
+_bash_profile_addpath PATH            "$HOME/sbin"
 _bash_profile_addpath LD_LIBRARY_PATH "$HOME/lib"
 _bash_profile_addpath MANPATH         "$HOME/man"
-_bash_profile_addpath PERLLIB         "$HOME/lib/perl5/site_perl"
-_bash_profile_addpath PERLLIB         "$HOME/lib/perl5/site_perl/`perl -V:version|cut -d "'" -f 2`"
-unset CVSROOT;_bash_profile_addpath CVSROOT "$HOME/pserver/cvs"
+
+_bash_profile_addpath CVSROOT         "$HOME/cvs" single
+_bash_profile_addpath CVSROOT         "$HOME/pserver/cvs" single
+
+for _perldir in $(eval "echo $HOME/lib/perl5/site_perl$(
+	for perlvar in version archname;do
+		echo -n '{,/'
+		perl -V:"$perlvar"|cut -d "'" -f 2|tr -d '\n'
+		echo -n '}'
+		done
+	)");do
+	_bash_profile_addpath PERLLIB "$_perldir"
+	done
+unset _perldir
+
+unset -f _bash_profile_addpath
 
 alias ls='ls -bF'
 alias l='ls -lbF'
@@ -34,5 +51,37 @@ export IGNOREEOF=10
 export TMOUT=900
 export EDITOR='vim'
 export LC_CTYPE=cs_CZ.ISO-8859-2
+export PERL_MM_OPT="PREFIX=$HOME"
+export WWW_HOME="file:///home/short/.bookmarks.html"
+export GREP_OPTIONS="--binary-files=without-match --directories=skip"
+
+function cvsdiff    { cvs diff   "$@" 2>&1|             less; }; export -f cvsdiff
+function cvsdiffi   { cvs diff   "$@" 2>&1|grep -v '^?'|less; }; export -f cvsdiffi
+function cvsupdate  { cvs update "$@" 2>&1|             less; }; export -f cvsupdate
+function cvsupdatei { cvs update "$@" 2>&1|grep -v '^?'|less; }; export -f cvsupdatei
+function cvsfiles {
+	for i in `find . -name Entries|grep '/CVS/Entries$'`;do
+		j="`echo "$i"|sed 's,CVS/Entries$,,'`"
+		sed -n 's,^/\([^/]*\)/[^-].*$,'"$j"'\1,p' <$i
+		done \
+		| sed 's%^\./%%'
+	}; export -f cvsfiles
+function cvsignore {
+	for i in `find . -name .cvsignore`;do
+		j="`echo "$i"|sed 's,\.cvsignore$,,'`"
+		sed -n 's,^.*$,'"$j"'&,p' <$i
+		done
+	}; export -f cvsignore
+function cvsignorerm { cvsignore | xargs rm -f; }; export -f cvsignorerm
+
+function wclines { awk '{x[$0]++}END{for (i in x) print x[i]"\t"i}'; }; export -f wclines
+function ulimitme { ulimit -m 100000 -d 150000 -v 200000; }; export -f ulimitme
+function grep { ( ulimitme; `which grep` "$@"; ); }; export -f grep
+function rsync { `which rsync` -v -e ssh --progress --stats --partial "$@"; }; export -f rsync
 
 ulimit -c 0
+
+if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi
+
+	unset _home_short_dotbashrc	# permit later reinitializations
+fi	# _home_short_dotbashrc