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

 # Title: .bashrc

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

-# Version: 1.3

+# Version: 1.4

 # Created in: 2012-05-26

-# Modified in: 2014-07-19

+# Modified in: 2014-07-26

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

 # Versions #

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

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

 # v1.1 - 2014-07-02: bug corrections in trash function and EDITOR set up / exit and diff aliases added

@@ -91,23 +92,6 @@ shopt -s cdspell

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

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

-## Key binding

-#bind '"\e[1~": beginning-of-line'		# home

-#bind '"\e[2~": overwrite-mode'			# insert

-#bind '"\e[3~": delete-char'				# del

-#bind '"\e[4~": end-of-line'				# end

-#bind '"\e[5~": history-search-backward'	# page up

-#bind '"\e[6~": history-search-forward'	# page down

-#bind '"\e[A": up-line-or-history'		# arrow up

-#bind '"\e[B": down-line-or-history'		# arrow down

-#bind '"\e[C": forward-char'				# arrow right

-#bind '"\e[D": backward-char'			# arrow left

-

-#bind '"\e[H":  beginning-of-line'		# home (xterm)

-#bind '"\e[F":  end-of-line'				# end (xterm)

-

-#bind '"^R": history-incremental-search-backward'

-

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

 # Color options #

@@ -131,7 +115,7 @@ fi

 if [[ "$color_prompt" == "yes" ]]

 then

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

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

     then

 		PS1='\[\e[31m\][$(date +%H:%M) \u@\[\e[01;35m\]\h\[\e[00;31m\]:\[\e[33m\]\W\[\e[31m\]]\[\e[00m\]\$ '

 	else

@@ -202,7 +186,7 @@ alias diff="diff -y --suppress-common-lines"

 alias dl="wget -c"

 alias scp="scp -pr"

 alias ssh="ssh -Y"

-alias wf="ssh wf@vaderf.com"

+alias wf="ssh -i $HOME/.ssh/id_main-server.dsa wf@vaderf.com"

 alias fwf="ssh fred@vaderf.com"

 alias heron="ssh fcheval@heron.txbiomedgenetics.org"

@@ -357,6 +341,29 @@ function q {

 }

+# SSH agent function

+function start_agent {

+    if [[ $LANG =~ ^fr ]]

+    then

+        msg1="Initialisation du nouvel agent SSH..."

+        msg2="Opération réussi"

+    else

+        msg1="Initializing new SSH agent..."

+        msg2="Succeeded"

+    fi

+

+    # SSH agent environment

+    echo -e "\n${msg1}"

+    ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"

+    echo -e "${msg2}\n"

+    chmod 600 "${SSH_ENV}"

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

+

+    # SSH key add

+    ssh-add

+}

+

+

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

 # User specific environment and startup programs #

@@ -382,3 +389,20 @@ export TEXMFHOME="$HOME/.texmf"

 # R environment

 export R_HISTFILE="$HOME/.Rhistory"

 export R_HISTSIZE=$HISTSIZE

+

+

+# SSH environment

+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