upstream/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-09-21 00:05:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent starting multiple gpg-agents

Browse Source 
Don't just overwrite the environment. First check for a running agent (an
x-session might have one running). If no agent is found, source the
environment and check again using those settings. If again no agent is
found, start a new instance.
This commit is contained in:
Olaf Conradi 2013-06-23 11:34:03 +02:00
parent 78dba754d1
commit 711e96b1a2
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 sources 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