scott/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Scott Wallace 2015-09-29 19:49:49 +01:00
parent 8fd9f6a8e3
commit 56e206ab74
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
.bashrc
View file

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