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

save SSH_AUTH_SOCK and SSH_AGENT_PID before reading GPG_ENV

Browse source 
GPG_ENV possibly contains SSH_AUTH_SOCK and SSH_AGENT_PID from a
gpg-agent previously started with the ssh agent built-in functionality
enabled. If an ssh-agent is already live, we should use the existing
ssh-agent's environmental variables rather than the old variables from
the GPG_ENV file.
This commit is contained in:
Ehren Kret 2014-06-09 10:59:57 -07:00
commit b98b27d3d5
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,9 +16,24 @@ 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
# check if ssh-agent is running
local SSH_RUNNING=1
local OLD_SSH_AUTH_SOCK=
local OLD_SSH_AGENT_PID=
if [[ -n "$SSH_AGENT_PID" ]]; then
kill -0 $SSH_AGENT_PID
SSH_RUNNING=$?
if [[ $SSH_RUNNING -eq 0 ]]; then
OLD_SSH_AUTH_SOCK="$SSH_AUTH_SOCK"
OLD_SSH_AGENT_PID="$SSH_AGENT_PID"
fi
fi
# 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
SSH_AUTH_SOCK="${OLD_SSH_AUTH_SOCK:-$SSH_AUTH_SOCK}"
SSH_AGENT_PID="${OLD_SSH_AGENT_PID:-$SSH_AGENT_PID}"
export GPG_AGENT_INFO export GPG_AGENT_INFO
export SSH_AUTH_SOCK export SSH_AUTH_SOCK
export SSH_AGENT_PID export SSH_AGENT_PID
@ -26,8 +41,7 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
# check again if another agent is running using the newly sourced settings # check again if another agent is running using the newly sourced settings
if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
# check for existing ssh-agent if [[ $SSH_RUNNING -eq 0 ]]; then
if ssh-add -l > /dev/null 2> /dev/null; then
# ssh-agent running, start gpg-agent without ssh support # ssh-agent running, start gpg-agent without ssh support
start_agent_nossh; start_agent_nossh;
else else