Merge pull request #1963 from shajra/pr/gpg-fix

fix gpg-agent "running already" check
This commit is contained in:
Robby Russell 2013-10-24 20:25:33 -07:00
commit e44c147e25

View File

@ -19,6 +19,9 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
# source settings of old agent, if applicable # 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
export GPG_AGENT_INFO
export SSH_AUTH_SOCK
export SSH_AGENT_PID
fi fi
# check again if another agent is running using the newly sourced settings # check again if another agent is running using the newly sourced settings