variables (and _bash_profile_addpath() stuff) moved: .bash_profile -> .bashrc

 - .bash_profile isn't executed during 'ssh host cmd'
   - custom override of system 'cvs' command wasn't in effect

diff --git a/.bash_profile b/.bash_profile
index 63eb16d..7ff84cd 100644 (file)
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,25 +1,3 @@
-function _bash_profile_addpath # variable,dirpathname
-{
-       if [ '!' -d "$2" ];then return;fi
-       if [ -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 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`"
-
-export IGNOREEOF=10
-export TMOUT=900
-export EDITOR='vim'
-export LC_CTYPE=cs_CZ.ISO-8859-2
 export BASH_ENV="$HOME/.bashrc";source "$BASH_ENV"
 finger
 m

diff --git a/.bashrc b/.bashrc
index 29199c5..10d1852 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -1,5 +1,24 @@
 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
+               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 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"
+
 alias ls='ls -bF'
 alias l='ls -lbF'
 alias maple="ssh -t vega.fjfi.cvut.cz maple"
@@ -11,7 +30,9 @@ 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
 
 ulimit -c 0