@@ -1,8 +1,8 @@

 # Title: .bashrc

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

-# Version: 1.4

+# Version: 1.5

 # Created in: 2012-05-26

-# Modified in: 2014-07-26

+# Modified in: 2014-08-06

@@ -19,6 +19,7 @@

 # Versions #

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

+# v1.5 - 2014-08-06: autocd set on / R alias added / bk function turned in a separate script / SSH environment setup moved in bash_profile

 # v1.4 - 2014-07-26: ssh_agent function for SSH key management added / ssh_agent called when used SSH connexion / wf alias updated

 # v1.3 - 2014-07-19: bug correction for PS1 (\[\e and \] missing for each color) / typo corrections

 # v1.2 - 2014-07-06: h and t aliases corrected / m alias added / quit function added / R env variables added

@@ -87,7 +88,7 @@ shopt -s checkwinsize

 shopt -s cdspell

 # Avoid cd usage

-#shopt -s autocd

+shopt -s autocd

 # Make less more friendly for non-text input files, see lesspipe(1)

 [[ -x /usr/bin/lesspipe ]] && eval "$(SHELL=/bin/sh lesspipe)"

@@ -204,6 +205,7 @@ alias h="head"

 alias t="tail"

 alias m="more"

 alias bye="exit"

+alias R="R --no-save"

 # You may want to put all your additions into a separate file like

@@ -315,18 +317,6 @@ else

 fi

-# Backup function

-function bk {

-	if [[ -f "$1" || -d "$1" ]]

-	then

-		mydate=$(date +%F)

-		cp -R "$1" "$1.bk_$mydate"

-	else

-		echo -e "$1 is not a file or a directory"

-	fi

-}

-

-

 # Quit function

 function q {

     read -a ans -p "Do you want to exit [Y/n]? "

@@ -342,6 +332,8 @@ function q {

 # SSH agent function

+# Usage: function used to store SSH environment (SSH key in ssh-agent)

+# See .bash_profile from servers for use

 function start_agent {

     if [[ $LANG =~ ^fr ]]

     then

@@ -392,17 +384,5 @@ export R_HISTSIZE=$HISTSIZE

 # SSH environment

-SSH_ENV="$HOME/.ssh/ssh_agent_$HOSTNAME"

+export SSH_ENV="$HOME/.ssh/ssh_agent_$HOSTNAME"

-if [[ -n "$SSH_CONNECTION" ]]

-then

-	# Source SSH settings, if applicable

-	if [[ -f "${SSH_ENV}" ]]

-	then

-		source "${SSH_ENV}" > /dev/null

-		#ps ${SSH_AGENT_PID} doesn't work under cywgin

-		ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || start_agent

-	else

-		start_agent

-	fi

-fi

\ No newline at end of file

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

 # Title: .bash_profile

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

-# Version: 1.2

+# Version: 1.3

 # Created in: 2012-05-25

-# Modified in: 2014-07-09

+# Modified in: 2014-08-06

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

 # Versions #

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

+# v1.3 - 2014-08-06: part for SSH environment setup moved from .bashrc to avoid setting up SSH environment when connection to a node (qrsh)

 # v1.2 - 2014-07-09: behaviour modified when login to a node using qrsh (qrsh alias modified / if loop correction for message)

 # v1.1 - 2014-07-01: specific aliases needed for GridEngine added

 # v1.0 - 2014-06-28: rewriting for better interplay with .bashrc

@@ -88,6 +89,24 @@ fi

 export R_LIBS="${R_LIBS_HOME}/${R_version}"

+# SSH environment setup

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

+then

+    if [[ -n "$SSH_CONNECTION" ]]

+    then

+        # Source SSH settings, if applicable

+        if [[ -f "${SSH_ENV}" ]]

+        then

+            source "${SSH_ENV}" > /dev/null

+            #ps ${SSH_AGENT_PID} doesn't work under cywgin

+            ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || start_agent

+        else    

+            start_agent

+        fi

+    fi

+fi

+

+

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

 # Welcome message #