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

 # Title: .bash_profile

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

-# Version: 2.2

+# Version: 2.3

 # Created in: 2012-05-25

-# Modified in: 2017-04-23

+# Modified in: 2019-03-10

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

 # Versions #

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

+# v2.3 - 2019-03-10: alias updated / R hack for medusa2 added / no ssh key usage or storage for heron

 # v2.2 - 2017-04-23: server name updated / SSH connection through screen improved / welcome message improved

 # v2.1 - 2016-07-25: bug about space corrected / exit if not interactive (due to Grid Engine)

 # v2.0 - 2016-06-12: PATH setup improved / start_agent with multikey management / start_agent calling improved / screen behaviour added / welcome message improved / alias updated

@@ -53,7 +54,8 @@ alias pqrsh='qrsh -V -cwd -pty y bash -li'

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

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

-alias medusa='ssh medusa'

+[[ $HOSTNAME =~ heron* ]] && alias ssh="ssh -o PreferredAuthentications=password -o PubkeyAuthentication=no"

+alias medusa2='ssh medusa2'

 alias perseus='ssh perseus'

 alias mendel='ssh mendel'

 alias crow='ssh crow'

@@ -80,6 +82,7 @@ export LC_NUMERIC=en_US.UTF-8   # To always have . as decimal separator

 export LC_NAME=en_US.UTF-8

 LC_ALL=

+bind 'set show-all-if-unmodified off'

 #-------#

 # Paths #

@@ -102,6 +105,9 @@ then

     export PATH=$PATH:/opt/openmpi/bin:/opt/bio/ncbi/bin:/opt/bio/mpiblast/bin:/opt/bio/hmmer/bin:/opt/bio/EMBOSS/bin:/opt/bio/clustalw/bin:/opt/bio/tcoffee/bin:/opt/bio/phylip/exe:/opt/bio/mrbayes:/opt/bio/fasta:/opt/bio/glimmer/bin:/opt/bio/glimmer/scripts:/opt/bio/gromacs/bin:/opt/bio/gmap/bin:/opt/bio/tigr/bin:/opt/bio/autodocksuite/bin:/opt/bio/wgs/bin:/opt/eclipse:/opt/ganglia/bin:/opt/ganglia/sbin:/opt/rocks/bin:/opt/rocks/sbin:/opt/condor/bin:/opt/condor/sbin:/opt/gridengine/bin/lx26-amd64:/usr/bin:/usr/local/bin:/bin:/usr/java/latest/bin

     # Grid Engine path

     export PATH=$PATH:/opt/gridengine/bin/linux-x64

+    # R

+    echo -e "\n\e[33mWarning:\e[00m Hard alias for R. If not needed, please edit .bash_profile.\n"

+    alias R="$HOME/local/pckg/R-3.3.1/bin/R"

 fi

 # Perl

@@ -154,7 +160,7 @@ SSH_KEY_LIST="$HOME/.ssh/key_list"  # File with full path of keys (one per line)

 [[ -f "$SSH_KEY_LIST" ]] && SSH_KEYS=($(cat $SSH_KEY_LIST))

 #lifetime="-t 259200" # seconds => 3 days

-if [[ ! $HOSTNAME =~ compute.* ]]

+if [[ ! ($HOSTNAME =~ heron* || $HOSTNAME =~ compute.*) ]]

 then

     if [[ -n "$SSH_CONNECTION" ]]

     then

@@ -177,7 +183,7 @@ fi

 # Display forwarding

 # dependency: proxy-dsiplay

-if [[ ! ($HOSTNAME =~ perseus* || $HOSTNAME =~ medusa* || $HOSTNAME =~ compute.*) && -n "$DISPLAY" && $(which proxy-display &> /dev/null; echo $?) == 0 ]]

+if [[ ! ($HOSTNAME =~ heron* || $HOSTNAME =~ perseus* || $HOSTNAME =~ medusa* || $HOSTNAME =~ compute.*) && -n "$DISPLAY" && $(which proxy-display &> /dev/null; echo $?) == 0 ]]

 then

     proxy-display :99

 fi