mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-08-07 06:08:39 +02:00
Restore ssh-agent variables if found alive gpg-agent
This commit is contained in:
parent
0b4bba4ca2
commit
8f0ab14776
1 changed files with 9 additions and 1 deletions
|
|
@ -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
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue