Skip to content

O
oh-my-zsh
Commit e44c147e authored by Robby Russell's avatar Robby Russell
Browse files
Options

Merge pull request #1963 from shajra/pr/gpg-fix 

fix gpg-agent "running already" check
parents 86d57e83 cf8d7609
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
plugins/gpg-agent/gpg-agent.plugin.zsh
View file @ e44c147e
...@@ -19,6 +19,9 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then ...@@ -19,6 +19,9 @@ if ! gpg-connect-agent --quiet /bye > /dev/null 2> /dev/null; then
# 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
export GPG_AGENT_INFO
export SSH_AUTH_SOCK
export SSH_AGENT_PID
fi fi
# check again if another agent is running using the newly sourced settings # check again if another agent is running using the newly sourced settings
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment