X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=.bashrc;h=977133ba459299a8a129805ce31d1638e9ded793;hb=c26ee2523bb7fa5b2b7414c37f3c36e8922b1f8d;hp=cdc9a486730959a8aac250aba9bc395a7ce58ae4;hpb=6e6b9ae780a7b9a4c552f1acf1a58d8375dbbf4a;p=nethome.git

diff --git a/.bashrc b/.bashrc
index cdc9a48..977133b 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,14 +1,56 @@
+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 [ -n "$3" -o -z "`eval "echo \\${$1}"`" ];then
+		eval "$1='$2'"
+	else
+		# we want to override any original directories, place dirpathname first!
+		eval "$1=\"$2:\${$1}\""
+	fi
+	export "$1"
+}
+
+_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`"
+_bash_profile_addpath CVSROOT         "$HOME/cvs" single
+_bash_profile_addpath CVSROOT         "$HOME/pserver/cvs" single
+
+unset -f _bash_profile_addpath
+
 alias ls='ls -bF'
 alias l='ls -lbF'
-alias maple="ssh1 -t -v vega.fjfi.cvut.cz maple"
+alias maple="ssh -t vega.fjfi.cvut.cz maple"
 #alias cc='cc -I/home/short/include'
+alias vi='vim'
 
 weberr="/var/log/httpd/error/klokan.error_log"
 if [ -f "$weberr" ];then alias weberr='tail "$weberr"';fi
 weblog="/var/log/httpd/klokan.access_log"
 if [ -f "$weblog" ];then alias weblog='tail -n 20000 "$weblog"|grep "\\(~\\|%7[eE]\\)short"';fi
 
-export CVSROOT=/home/short/pserver/cvs
-if [ '!' -d $CVSROOT ];then unset CVSROOT;fi
+export IGNOREEOF=10
+export TMOUT=900
+export EDITOR='vim'
+export LC_CTYPE=cs_CZ.ISO-8859-2
+
+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 wclines { awk '{x[$0]++}END{for (i in x) print x[i]"\t"i}'; }; export -f wclines
 
 ulimit -c 0
+
+if [ -f "$HOME/.bashrc.local" ];then source "$HOME/.bashrc.local";fi
+
+fi	# _home_short_dotbashrc