diff options
| author | yleo77 <ylep77@gmail.com> | 2013-07-16 16:37:18 +0800 |
|---|---|---|
| committer | yleo77 <ylep77@gmail.com> | 2013-07-16 16:37:18 +0800 |
| commit | 67b2781f6200a0dff35055eb67937a0df2be2c51 (patch) | |
| tree | 73b692f4146042966f7d2fed10ab88946cbc077b /plugins/gpg-agent/gpg-agent.plugin.zsh | |
| parent | 6b832b93588567cb00b9a9e8170a5ebf539dea51 (diff) | |
| parent | 7f74294d7aa7ab86e18e70a1153c15fa373c5849 (diff) | |
| download | zsh-67b2781f6200a0dff35055eb67937a0df2be2c51.tar.gz zsh-67b2781f6200a0dff35055eb67937a0df2be2c51.tar.bz2 zsh-67b2781f6200a0dff35055eb67937a0df2be2c51.zip | |
Merge remote-tracking branch 'robbyrussell/master'
Diffstat (limited to 'plugins/gpg-agent/gpg-agent.plugin.zsh')
| -rw-r--r-- | plugins/gpg-agent/gpg-agent.plugin.zsh | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh index 109af44c8..4071334cb 100644 --- a/plugins/gpg-agent/gpg-agent.plugin.zsh +++ b/plugins/gpg-agent/gpg-agent.plugin.zsh @@ -14,16 +14,24 @@ function start_agent_withssh { export SSH_AGENT_PID } -# source settings of old agent, if applicable -if [ -f "${GPG_ENV}" ]; then - . ${GPG_ENV} > /dev/null -fi +# check if another agent is running +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 + fi -# check for existing ssh-agent -if ssh-add -l > /dev/null 2> /dev/null; then - start_agent_nossh; -else - start_agent_withssh; + # check again if another agent is running using the newly sourced settings + if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then + # check for existing ssh-agent + if ssh-add -l > /dev/null 2> /dev/null; then + # ssh-agent running, start gpg-agent without ssh support + start_agent_nossh; + else + # otherwise start gpg-agent with ssh support + start_agent_withssh; + fi + fi fi GPG_TTY=$(tty) |