holm/ohmyzsh
1
1
Fork 0
forked from extern/ohmyzsh
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable ssh-agent support if another ssh-agent is already running.

Browse Source
This commit is contained in:
Heiko Reese 2013-02-21 02:46:20 +01:00
parent fce68bbba0
commit 014ed1f0e5
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
plugins/gpg-agent/gpg-agent.plugin.zsh
View File

@ -1,26 +1,31 @@
# Based on ssh-agent code
local GPG_ENV=$HOME/.gnupg/gpg-agent.env local GPG_ENV=$HOME/.gnupg/gpg-agent.env
function start_agent { function start_agent_nossh {
/usr/bin/env gpg-agent --daemon --enable-ssh-support --write-env-file ${GPG_ENV} > /dev/null eval $(/usr/bin/env gpg-agent --daemon --write-env-file ${GPG_ENV}) > /dev/null
chmod 600 ${GPG_ENV} export GPG_AGENT_INFO
. ${GPG_ENV} > /dev/null
} }
# Source GPG agent settings, if applicable function start_agent_withssh {
eval $(/usr/bin/env gpg-agent --daemon --enable-ssh-support --write-env-file ${GPG_ENV}) > /dev/null
export GPG_AGENT_INFO
export SSH_AUTH_SOCK
export SSH_AGENT_PID
}
# make sure all created files are u=rw only
umask 177
# 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
ps -ef | grep ${SSH_AGENT_PID} | grep gpg-agent > /dev/null || {
start_agent;
}
else
start_agent;
fi fi
export GPG_AGENT_INFO # check for existing ssh-agent
export SSH_AUTH_SOCK if ssh-add -l > /dev/null 2> /dev/null; then
export SSH_AGENT_PID start_agent_nossh;
else
start_agent_withssh;
fi
GPG_TTY=$(tty) GPG_TTY=$(tty)
export GPG_TTY export GPG_TTY