Merge pull request #1620 from hreese/gpg-agent_with_sensible_ssh-agent

Disable ssh-agent support in gpg-agent-plugin if another ssh-agent is already available.
This commit is contained in:
Robby Russell 2013-04-23 20:37:48 -07:00
commit de1f803de9

View File

@ -1,26 +1,30 @@
# Based on ssh-agent code
local GPG_ENV=$HOME/.gnupg/gpg-agent.env local GPG_ENV=$HOME/.gnupg/gpg-agent.env
function start_agent { function start_agent_nossh {
/usr/bin/env gpg-agent --daemon --enable-ssh-support --write-env-file ${GPG_ENV} > /dev/null eval $(/usr/bin/env gpg-agent --quiet --daemon --write-env-file ${GPG_ENV} 2> /dev/null)
chmod 600 ${GPG_ENV} chmod 600 ${GPG_ENV}
. ${GPG_ENV} > /dev/null export GPG_AGENT_INFO
} }
# Source GPG agent settings, if applicable function start_agent_withssh {
eval $(/usr/bin/env gpg-agent --quiet --daemon --enable-ssh-support --write-env-file ${GPG_ENV} 2> /dev/null)
chmod 600 ${GPG_ENV}
export GPG_AGENT_INFO
export SSH_AUTH_SOCK
export SSH_AGENT_PID
}
# source settings of old agent, if applicable
if [ -f "${GPG_ENV}" ]; then if [ -f "${GPG_ENV}" ]; then
. ${GPG_ENV} > /dev/null . ${GPG_ENV} > /dev/null
ps -ef | grep ${SSH_AGENT_PID} | grep gpg-agent > /dev/null || {
start_agent;
}
else
start_agent;
fi fi
export GPG_AGENT_INFO # check for existing ssh-agent
export SSH_AUTH_SOCK if ssh-add -l > /dev/null 2> /dev/null; then
export SSH_AGENT_PID start_agent_nossh;
else
start_agent_withssh;
fi
GPG_TTY=$(tty) GPG_TTY=$(tty)
export GPG_TTY export GPG_TTY