summaryrefslogtreecommitdiff
path: root/plugins/gpg-agent/gpg-agent.plugin.zsh
diff options
context:
space:
mode:
authorSukant Hajra <rrudbskr5g@snkmail.com>2013-07-11 01:36:50 -0500
committerSukant Hajra <rrudbskr5g@snkmail.com>2013-07-11 01:36:50 -0500
commit3d204883a69355b95248b72e8c2078718fb07802 (patch)
treeaecca638484ce0a9162a67cc7a01413b88cffba2 /plugins/gpg-agent/gpg-agent.plugin.zsh
parent7f74294d7aa7ab86e18e70a1153c15fa373c5849 (diff)
downloadzsh-3d204883a69355b95248b72e8c2078718fb07802.tar.gz
zsh-3d204883a69355b95248b72e8c2078718fb07802.tar.bz2
zsh-3d204883a69355b95248b72e8c2078718fb07802.zip
fix gpg-agent "running already" check
The GPG_ENV file is sourced before doing the gpg-connect-agent check, but this file (unlike the SSH_ENV file) doesn't export GPG_AGENT_INFO, so the check always fails. This results in new gpg-agents continuously being spawned. All this commit does is put in the single export to fix the problem.
Diffstat (limited to 'plugins/gpg-agent/gpg-agent.plugin.zsh')
-rw-r--r--plugins/gpg-agent/gpg-agent.plugin.zsh1
1 files changed, 1 insertions, 0 deletions
diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 4071334cb..b6992479d 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -19,6 +19,7 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
# source settings of old agent, if applicable
if [ -f "${GPG_ENV}" ]; then
. ${GPG_ENV} > /dev/null
+ export GPG_AGENT_INFO
fi
# check again if another agent is running using the newly sourced settings