--- a/.bash_path	Sat Jul 07 12:49:51 2012 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-# set -x
-# set -u
-
-# XXX for mc, cvs, svn, ...
-export EDITOR=vim
-
-# XXX vim and gnome-terminal have support for 256 colours in fedora 8 at least
-# Note debian/ubuntu users should install the ncurses-term package to support this
-# export TERM=xterm-256color
-
-# Special case for CYGWIN to properly display russian letters in rxvt.
-# Don't forget set in Windows SHELL=/bin/bash. If default SHELL is sh then .bashrc will not be read.
-if [[ $OSTYPE = cygwin ]]; then
-  export LANG=ru_RU.CP1251
-  # Avoid permission problem in Cygwin.
-  umask 0000
-fi
-
-# Easy cd to often used dirs.
-export CDPATH=.:~:~/devel:~/devel/my-devel
-
-if [[ ! $PATH =~ $HOME/usr/bin ]]; then
-  export PATH=$PATH:~/usr/bin
-fi
-if [[ ! $PATH =~ /usr/sbin ]]; then
-  export PATH=$PATH:/usr/sbin
-fi
-
-if [[ ! $LD_LIBRARY_PATH =~ $HOME/usr/lib ]]; then
-  export LD_LIBRARY_PATH=$HOME/usr/lib
-else
-  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":$HOME/usr/lib
-fi
-
-if [[ -z "$MANPATH" ]]; then
-  export MANPATH=~/usr/share/man:
-elif [[ ! $MANPATH =~ $HOME/usr/share/man: ]]; then
-  export MANPATH=$MANPATH:$HOME/usr/share/man:
-fi
-
-if [[ -z "$INFOPATH" ]]; then
-  export INFOPATH=~/usr/share/info:
-elif [[ ! $INFOPATH =~ $HOME/usr/share/info: ]]; then
-  export INFOPATH=$INFOPATH:$HOME/usr/share/info:
-fi
-
-export PYTHONSTARTUP=~/.pystartup
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.bashenv	Sun Jul 08 13:59:21 2012 +0300
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# set -x
+# set -u
+
+# XXX for mc, cvs, svn, ...
+export EDITOR=vim
+
+# XXX vim and gnome-terminal have support for 256 colours in fedora 8 at least
+# Note debian/ubuntu users should install the ncurses-term package to support this
+# export TERM=xterm-256color
+
+# Special case for CYGWIN to properly display russian letters in rxvt.
+# Don't forget set in Windows SHELL=/bin/bash. If default SHELL is sh then .bashrc will not be read.
+if [[ $OSTYPE = cygwin ]]; then
+  export LANG=ru_RU.CP1251
+  # Avoid permission problem in Cygwin.
+  umask 0000
+fi
+
+# Easy cd to often used dirs.
+export CDPATH=.:~:~/devel:~/devel/my-devel
+
+if [[ ! $PATH =~ $HOME/usr/bin ]]; then
+  export PATH=$PATH:~/usr/bin
+fi
+if [[ ! $PATH =~ /usr/sbin ]]; then
+  export PATH=$PATH:/usr/sbin
+fi
+
+if [[ ! $LD_LIBRARY_PATH =~ $HOME/usr/lib ]]; then
+  export LD_LIBRARY_PATH=$HOME/usr/lib
+else
+  export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":$HOME/usr/lib
+fi
+
+if [[ -z "$MANPATH" ]]; then
+  export MANPATH=~/usr/share/man:
+elif [[ ! $MANPATH =~ $HOME/usr/share/man: ]]; then
+  export MANPATH=$MANPATH:$HOME/usr/share/man:
+fi
+
+if [[ -z "$INFOPATH" ]]; then
+  export INFOPATH=~/usr/share/info:
+elif [[ ! $INFOPATH =~ $HOME/usr/share/info: ]]; then
+  export INFOPATH=$INFOPATH:$HOME/usr/share/info:
+fi
+
+export PYTHONSTARTUP=~/.pystartup
+

--- a/.bashrc	Sat Jul 07 12:49:51 2012 +0300
+++ b/.bashrc	Sun Jul 08 13:59:21 2012 +0300
@@ -5,8 +5,8 @@
 # XXX
 # [[ -f /etc/bashrc ]] && . /etc/bashrc
 
-if [[ -f ~/.bash_path ]]; then
-  . ~/.bash_path
+if [[ -f ~/.bashenv ]]; then
+  . ~/.bashenv
 fi
 
 PS1='bash# '

--- a/.xinitrc	Sat Jul 07 12:49:51 2012 +0300
+++ b/.xinitrc	Sun Jul 08 13:59:21 2012 +0300
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ -f ~/.bash_path ]]; then
-  . ~/.bash_path
+if [[ -f ~/.bashenv ]]; then
+  . ~/.bashenv
 fi
 # Load custom settings (user editable).
 if [[ -f ~/.bash_custom ]]; then

--- a/Makefile	Sat Jul 07 12:49:51 2012 +0300
+++ b/Makefile	Sun Jul 08 13:59:21 2012 +0300
@@ -36,7 +36,7 @@
 OVERRIDDEN_ITEMS := \
     .fvwm .xxkbrc .xmodmaprc .fonts.conf \
     .inputrc .minttyrc .Xdefaults .xinitrc .xserverrc .screenrc .dircolors \
-    .bashrc .bash_path .bash_completion .zshrc .vimrc .ssh \
+    .bashrc .bashenv .bash_completion .zshrc .vimrc .ssh \
     .pylintrc .pystartup \
     .guile \
     .signature .muttrc .tidy \