linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-05-08 04:34:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 833292891c into 291e96dcd0

Browse source
This commit is contained in:
Andrey Yantsen 2017-05-03 15:06:19 +00:00 • committed by GitHub
commit 4ada792daf
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,15 @@ function start_agent_withssh {
} }
# check if another agent is running # check if another agent is running
if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then if gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
# source settings of old agent, if applicable
if [ -f "${GPG_ENV}" ] && [ -z "${SSH_AGENT_PID}"]; then
. ${GPG_ENV} > /dev/null
export GPG_AGENT_INFO
export SSH_AUTH_SOCK
export SSH_AGENT_PID
fi
else
# 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