matir/skel
1
0
Fork 0
mirror of https://github.com/Matir/skel.git synced 2026-05-26 13:35:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Don't clobber ssh-agent

Browse Source
This commit is contained in:
David Tomaschik
2017-11-01 08:54:28 -07:00
parent fdf1ec9790
commit 157ff8a451
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dotfiles/zsh_custom/plugins/gpg-agent/gpg-agent.plugin.zsh
View File

@@ -1,4 +1,4 @@
# Custom agent to handle gpg-agent 2.1 # Custom plugin to handle gpg-agent 2.1
local GPG_ENV=$HOME/.gnupg/gpg-agent.env local GPG_ENV=$HOME/.gnupg/gpg-agent.env
@@ -18,13 +18,14 @@ function start_agent_withssh {
if [ -z "${GPG_AGENT_INFO}" ] ; then if [ -z "${GPG_AGENT_INFO}" ] ; then
if which gpgconf >/dev/null 2>&1 ; then if which gpgconf >/dev/null 2>&1 ; then
# This might clobber SSH_AUTH_SOCK anyway...
GPG_AGENT_INFO=$(gpgconf --list-dirs agent-socket) GPG_AGENT_INFO=$(gpgconf --list-dirs agent-socket)
SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
export GPG_AGENT_INFO export GPG_AGENT_INFO
if [ -z "${SSH_AUTH_SOCK}" ] ; then
SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
export SSH_AUTH_SOCK export SSH_AUTH_SOCK
fi fi
fi fi
fi
# check if another agent is running # check if another agent is running
if ! gpg-connect-agent --agent-program /dev/null --quiet /bye > /dev/null 2> /dev/null; then if ! gpg-connect-agent --agent-program /dev/null --quiet /bye > /dev/null 2> /dev/null; then