`e44c147e25ec5dfbf20d5b98544c8b8484abd856`

Author: Robby Russell <robby@planetargon.com>
Committer: Robby Russell <robby@planetargon.com>
Date: 2013-10-25 03:25 UTC

Message

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

fix gpg-agent "running already" check

Diff

 1diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
 2index 4071334cb74fc18270a94a7bce4c88e9bf045357..3e6a34f425f36d8e8765dde30cc1dc3767020849 100644
 3--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
 4+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
 5@@ -19,6 +19,9 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
 6     # source settings of old agent, if applicable
 7     if [ -f "${GPG_ENV}" ]; then
 8         . ${GPG_ENV} > /dev/null
 9+        export GPG_AGENT_INFO
10+        export SSH_AUTH_SOCK
11+        export SSH_AGENT_PID
12     fi
13 
14     # check again if another agent is running using the newly sourced settings