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

Restore ssh-agent variables if found alive gpg-agent

Browse source 
Those changes fix working with gpg-agent instead of ssh-agent when first one was run outside zsh.
This commit is contained in:
Andrey Yantsen 2016-01-24 14:43:52 +03:00
commit 833292891c
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
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
if [ -f "${GPG_ENV}" ]; then
. ${GPG_ENV} > /dev/null