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

 # Title: .bash_profile

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

-# Version: 1.3

+# Version: 2.0

 # Created in: 2014-01-07

-# Modified in: 2014-09-25

+# Modified in: 2016-06-10

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

 # Versions #

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

+# v2.0 - 2016-06-10: PATH updated / DISPLAY variable setup improved to allow remote display through ssh / start_agent with multikey management / start_agent calling improved / ssh aliases updated

 # 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

@@ -36,6 +37,7 @@ fi

 alias medusa='ssh medusa'

 alias medusa2='ssh medusa2'

 alias mendel='ssh mendel'

+alias bulmer='ssh bulmer'

 # Shortcut for vim

 alias vi='vim'

@@ -49,36 +51,65 @@ alias wh="cd /cygdrive/c/Users/$USER/"

 # User specific environment and startup programs #

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

-# Personalized PATH

-export PATH="/usr/local/bin:/usr/bin:/cygdrive/c/Program Files/Common Files/Microsoft Shared/Windows Live:/cygdrive/c/Program Files (x86)/Common Files/Microsoft Shared/Windows Live:/cygdrive/c/Windows/system32:/cygdrive/c/Windows:/cygdrive/c/Windows/System32/Wbem:/cygdrive/c/Windows/System32/WindowsPowerShell/v1.0:/cygdrive/c/Program Files (x86)/Intel/Services/IPT:/cygdrive/c/Program Files (x86)/NTRU Cryptosystems/NTRU TCG Software Stack/bin:/cygdrive/c/Program Files/NTRU Cryptosystems/NTRU TCG Software Stack/bin:/cygdrive/c/Program Files/Dell/Dell Data Protection/Access/Advanced/Wave/Gemalto/Access Client/v5:/cygdrive/c/Program Files (x86)/Windows Live/Shared:/cygdrive/c/Program Files (x86)/Common Files/Roxio Shared/DLLShared:/cygdrive/c/Program Files (x86)/Common Files/Roxio Shared/OEM/DLLShared:/cygdrive/c/Program Files (x86)/Common Files/Roxio Shared/OEM/DLLShared:/cygdrive/c/Program Files (x86)/Common Files/Roxio Shared/OEM/12.0/DLLShared:/cygdrive/c/Program Files (x86)/Roxio/OEM/AudioCore:/usr/lib/lapack:$HOME/local/bin"

-

-# Set up the display variable to get an automatique display in the X server

-export DISPLAY=:0.0

+#---------------#

+# Personal Path #

+#---------------#

 # Java

-export JAVA_HOME=/cygdrive/c/Users/fcheval/AppData/Local/PortableApps/CommonFiles/Java

+export JAVA_HOME=/cygdrive/c/Users/$USER/AppData/Local/PortableApps/CommonFiles/Java

 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

+

+#----------------#

+# Window display #

+#----------------#

+

+# Set up the display variable to get an automatique display in the X server

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

+then

+    export DISPLAY=:0.0

+elif [[ -n "$SSH_CONNECTION" && -z "$DISPLAY" ]]

+then

+    flag="\$DISPLAY has no value"

+elif [[ -n "$SSH_CONNECTION" && $DISPLAY =~ ":0.0" ]]

+then

+    flag="Value of \$DISPLAY is $DISPLAY"

+fi

+

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

+then

+    msg="${flag}. You cannot display remote windows. If -Y was used, set \"X11Forwarding yes\" in the server sshd_config file (see man sshd_config)."

+    if [[ $(echo $PS1 | grep '\\e\[') ]]

+    then

+        echo -e "\n\e[33mWarning:\e[00m $msg\n"

+    else

+        echo "\nWarning: $msg\n"

+    fi

+fi

+

+

+#-----------------------#

+# SSH environment setup #

+#-----------------------#

+

+# Variables

+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

+

+# Loading keys

 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

+    source "$SSH_ENV"

     # Check if the ssh key is still stored

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

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

     then

         pkill ssh-agent

-        start_agent -t $lifetime

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

     fi

 else

-    start_agent -t $lifetime

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

 fi