Needed during transition dolly.vellum.cz->paulina.vellum.cz

diff --git a/.bash_profile b/.bash_profile
index 0e918a2..6daff10 100644 (file)
--- a/.bash_profile
+++ b/.bash_profile
@@ -16,9 +16,9 @@ if [ -d $HOME/step/pgsql ];then
 fi
 export IGNOREEOF=10
 export TMOUT=900
-export PERLLIB=~/lib/perl5/site_perl
-export EDITOR=vi
+export PERLLIB='~/lib/perl5/site_perl'
+export EDITOR='vim'
 export LC_CTYPE=cs_CZ.ISO-8859-2
-source ~/.bashrc
+export BASH_ENV="$HOME/.bashrc";source "$BASH_ENV"
 finger
 m

diff --git a/.bashrc b/.bashrc
index cdc9a48..cadbafd 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -1,7 +1,10 @@
+if [ -f /etc/bashrc ];then source /etc/bashrc;fi
+       
 alias ls='ls -bF'
 alias l='ls -lbF'
 alias maple="ssh1 -t -v 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