linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-19 20:29:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1904 from oohlaf/gpg-agent-fix

Browse source 
Prevent starting multiple gpg-agents
This commit is contained in:
Robby Russell 2013-06-25 09:07:49 -07:00
commit 354211f5ac
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/gpg-agent/gpg-agent.plugin.zsh
View file

@ -14,17 +14,25 @@ function start_agent_withssh {
export SSH_AGENT_PID export SSH_AGENT_PID
} }
# 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 # 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
fi fi
# 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 # check for existing ssh-agent
if ssh-add -l > /dev/null 2> /dev/null; then if ssh-add -l > /dev/null 2> /dev/null; then
# ssh-agent running, start gpg-agent without ssh support
start_agent_nossh; start_agent_nossh;
else else
# otherwise start gpg-agent with ssh support
start_agent_withssh; start_agent_withssh;
fi fi
fi
fi
GPG_TTY=$(tty) GPG_TTY=$(tty)
export GPG_TTY export GPG_TTY