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

 # Title: .bashrc

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

-# Version: 1.6

+# Version: 1.7

 # Created in: 2012-05-26

-# Modified in: 2014-08-16

+# Modified in: 2014-09-25

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

 # Versions #

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

+# v1.7 - 2014-09-25: start_agent function improved

 # v1.6 - 2014-08-16: new history entries to ignore / screen and :q aliases

 # 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

@@ -355,8 +356,8 @@ function start_agent {

     chmod 600 "${SSH_ENV}"

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

-    # SSH key add

-    ssh-add

+    # SSH key add ($@: useful to add ssh-add options like lifetime directly through start_agent)

+    ssh-add $@ 

 }

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

 # Title: .bash_profile

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

-# Version: 1.2

+# Version: 1.3

 # Created in: 2014-01-07

-# Modified in: 2014-08-26

+# Modified in: 2014-09-25

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

 # Versions #

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

+# v1.3 - 2014-09-25: start_agent with limited ssh key lifetime added

 # v1.2 - 2014-08-26: CHERE_INVOKING variable added 

 # v1.1 - 2014-08-20: multiscreen remove because of .screenrc set up / Java variables added

 # v1.0 - 2014-08-11: rewriting for better interplay with .bashrc

@@ -60,3 +61,24 @@ export PATH=$PATH:$JAVA_HOME/bin

 # Chere variable (read by /etc/profile - important to start new shell session from current directory instead of $HOME)

 export CHERE_INVOKING=1

+

+# SSH environment setup

+lifetime=259200 # seconds => 3 days

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

+then

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

+    

+    # Check if ssh-agent is active

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

+    if [[ ! $(ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$) ]]

+    then

+        start_agent -t $lifetime

+    # Check if the ssh key is still stored

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

+    then

+        pkill ssh-agent

+        start_agent -t $lifetime

+    fi

+else

+    start_agent -t $lifetime

+fi