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

 # Title: .bash_profile

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

-# Version: 2.0

+# Version: 2.1

 # Created in: 2012-05-25

-# Modified in: 2016-06-12

+# Modified in: 2016-07-25

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

 # Versions #

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

+# 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

 # 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

@@ -29,6 +30,11 @@

 # Get the aliases and functions #

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

+# If not running interactively, don't do anything

+## Required because Grid Engine runs any shell as login shell by default leading to unwanted messages in the job status

+[[ -z "$PS1" ]] && return

+

+# Load bashrc file

 if [[ -f ~/.bashrc ]]

 then

 	source ~/.bashrc

@@ -134,7 +140,7 @@ export R_LIBS="${R_LIBS_HOME}/${R_version}"

 # SSH environment setup

 SSH_KEY_LIST="$HOME/.ssh/key_list"  # File with full path of keys (one per line) to load with start_agent

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

-lifetime=259200 # seconds => 3 days

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

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

 then

@@ -149,10 +155,10 @@ then

             if [[ $(ssh-add -l &> /dev/null; echo $?) != 0 ]]

             then

                 pkill -u $USER ssh-agent

-                eval start_agent -t $lifetime ${SSH_KEYS[@]}

+                eval start_agent $lifetime ${SSH_KEYS[@]}

             fi

         else

-            eval start_agent -t $lifetime ${SSH_KEYS[@]}

+            eval start_agent $lifetime ${SSH_KEYS[@]}

         fi

     fi

 fi

@@ -211,7 +217,7 @@ then

 fi

 # Info on disk space and cores

-if [[ $name != "heron" && (-z $LC_STY || $LC_STY != 1) ]]

+if [[ ! ($HOSTNAME =~ heron* || $HOSTNAME =~ compute.*) && (-z $LC_STY || $LC_STY != 1) ]]

 then

     mydisk="/master /data"

     echo ""