Restore ssh-agent variables if found alive gpg-agent

This commit is contained in:
Andrey 'virus' Yantsen 2017-01-11 17:57:21 +03:00
commit 8f0ab14776

View file

@ -15,7 +15,15 @@ function start_agent_withssh {
}
# check if another agent is running
if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
if gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
# source settings of old agent, if applicable
if [ -f "${GPG_ENV}" ] && [ -z "${SSH_AGENT_PID}" ]; then
. ${GPG_ENV} > /dev/null
export GPG_AGENT_INFO
export SSH_AUTH_SOCK
export SSH_AGENT_PID
fi
else
# source settings of old agent, if applicable
if [ -f "${GPG_ENV}" ]; then
. ${GPG_ENV} > /dev/null