diff options
| author | Robby Russell <robby@planetargon.com> | 2013-10-24 20:25:33 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2013-10-24 20:25:33 -0700 |
| commit | e44c147e25ec5dfbf20d5b98544c8b8484abd856 (patch) | |
| tree | 0f522f8f047afd3d6c435215f2ee423740f71940 | |
| parent | 86d57e83ed09280cc9b535b38699efb557c58019 (diff) | |
| parent | cf8d76094c2e0032ebe5cc1d579e393521ed3b86 (diff) | |
| download | zsh-e44c147e25ec5dfbf20d5b98544c8b8484abd856.tar.gz zsh-e44c147e25ec5dfbf20d5b98544c8b8484abd856.tar.bz2 zsh-e44c147e25ec5dfbf20d5b98544c8b8484abd856.zip | |
Merge pull request #1963 from shajra/pr/gpg-fix
fix gpg-agent "running already" check
| -rw-r--r-- | plugins/gpg-agent/gpg-agent.plugin.zsh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh index 4071334cb..3e6a34f42 100644 --- a/plugins/gpg-agent/gpg-agent.plugin.zsh +++ b/plugins/gpg-agent/gpg-agent.plugin.zsh @@ -19,6 +19,9 @@ 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 + export SSH_AUTH_SOCK + export SSH_AGENT_PID fi # check again if another agent is running using the newly sourced settings |