@@ -1,14 +1,15 @@

 # Title: .bash_profile

 # Author: Frédéric CHEVALIER <f15.chevalier@gmail.com>

-# Version: 1.9

+# Version: 1.10

 # Created in: 2012-05-25

-# Modified in: 2015-04-20

+# Modified in: 2015-08-17

 #==========#

 # Versions #

 #==========#

+# v1.10 - 2015-08-17: Python lib adapted to the current version of Python / Consed env variable added / plocate updated to handle several db / pypm alias added / library path updated

 # v1.9 - 2015-04-20: Python env variable added / alias updated

 # v1.8 - 2014-12-02: proxy-display added (resolve $DISPLAY problem with screen)

 # v1.7 - 2014-10-22: alias added / conditional modification of PATH and Ld_LIBRARY_PATH to be able to use eog and evince on other server (crow, ...)

@@ -41,7 +42,7 @@ fi

 alias pqsub='qsub -V -cwd -o $HOME/status -j y -r y -S /bin/bash'

 alias pqsubR='qsub -V -cwd -o $HOME/status -j y -r y -S $(which Rscript)'

 alias pqrsh='qrsh -V -cwd -pty y bash -li'

-alias plocate='locate -d "$HOME/.mlocate.db"'

+alias plocate='locate -d "$mlocate_db"'

 alias xterm='xterm -bg black -fg white -rightbar -geometry 200x35'

 alias medusa='ssh -Y medusa'

@@ -50,6 +51,7 @@ alias mendel='ssh -Y mendel'

 alias crow='ssh -Y crow'

 alias bulmer='ssh -Y bulmer'

+alias pypm="pypm -g"    # Default parameter for pypm which is a package manager for python

 alias model_script_sh='cp $HOME/Templates/script.sh $1'

@@ -82,8 +84,10 @@ export PATH=:$HOME/local/bin:$HOME/local/share:$HOME/local/usr/local/bin:$PATH

 export PERL5LIB=~/local/lib/perl5/site_perl/5.18.2/x86_64-linux/auto:~/local/lib/perl5/5.18.2:~/local/lib/perl5/site_perl:~/local/lib/perl5/site_perl/5.18.2:~/local/lib/perl5/site_perl/5.18.2/x86_64-linux:~/local/lib/perl5/5.18.2/x86_64-linux:/usr/lib64/perl5/site_perl/5.8.8/x86_64-linux-thread-multi:/usr/lib/perl5/site_perl/5.8.8:/usr/lib/perl5/site_perl:/usr/lib64/perl5/vendor_perl/5.8.8/x86_64-linux-thread-multi:/usr/lib/perl5/vendor_perl/5.8.8:/usr/lib/perl5/vendor_perl:/usr/lib64/perl5/5.8.8/x86_64-linux-thread-multi:/usr/lib/perl5/5.8.8

 # Python

-export PYTHONPATH=$HOME/local/lib/python2.6/site-packages

+python_version=$(python --version 2>&1 | cut -d " " -f2 | cut -d "." -f -2)

+export PYTHONPATH=$HOME/local/lib/python${python_version}/site-packages

 export PYTHONIOENCODING=utf-8

+unset python_version

 # Special paths for medusa and nodes

 if [[ $HOSTNAME =~ medusa* || $HOSTNAME =~ compute.* ]]

@@ -94,7 +98,7 @@ then

     export PATH=$PATH:/opt/gridengine/bin/linux-x64 # System path needed for the new medusa

     # Location of bamtools lib (source: http://www.vcru.wisc.edu/simonlab/bioinformatics/programs/install/bamtools.htm)

-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/local/lib" #:$HOME/local/lib64" #Otherwise pb with heron  #:$LD_LIBRARY_PATH"

+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$HOME/local/lib:$HOME/local/lib64" # Otherwise pb with heron  #:$LD_LIBRARY_PATH"

 fi

@@ -102,6 +106,12 @@ fi

 # Programs #

 #----------#

+# Locate

+export mlocate_db=$(ls -1 "$HOME/.mlocate.db"* | tr "\n" ":")

+

+# Consed

+export CONSED_HOME=~/local/bin/consed.d

+

 # Vim

 export VIMHOME=$HOME/.vim