Ensure a noop if we have an ssh-agent environment configured.

This commit is contained in:
Scott Wallace 2015-09-29 19:49:49 +01:00
parent 8fd9f6a8e3
commit 56e206ab74

View file

@ -88,14 +88,17 @@ function start_agent {
/usr/bin/ssh-add ~/.ssh/scott_dsa /usr/bin/ssh-add ~/.ssh/scott_dsa
} }
# Source SSH settings, if applicable # Check if we already have an agent running and sourced
if [ -f "${SSH_ENV}" ]; then if [ -z "${SSH_AUTH_SOCK}" ]; then
# Source SSH settings, if applicable
if [ -f "${SSH_ENV}" ]; then
. "${SSH_ENV}" > /dev/null . "${SSH_ENV}" > /dev/null
pgrep ssh-agent | grep -E "^${SSH_AGENT_PID}" > /dev/null || { pgrep ssh-agent | grep -E "^${SSH_AGENT_PID}" > /dev/null || {
start_agent start_agent
} }
else else
start_agent start_agent
fi
fi fi
#-------------------------------------------------------------------------------- #--------------------------------------------------------------------------------