From 28d45d20dae0d94f0969304bb22531ccda60d148 Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Sun, 29 Oct 2017 20:38:39 -0700
Subject: [PATCH] Always use gpgconf when needed.

---
 .../plugins/gpg-agent/gpg-agent.plugin.zsh     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/dotfiles/zsh_custom/plugins/gpg-agent/gpg-agent.plugin.zsh b/dotfiles/zsh_custom/plugins/gpg-agent/gpg-agent.plugin.zsh
index 3d77c41..214ceca 100644
--- a/dotfiles/zsh_custom/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/dotfiles/zsh_custom/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -16,16 +16,20 @@ function start_agent_withssh {
     export SSH_AGENT_PID
 }
 
+if [ -z "${GPG_AGENT_INFO}" ] ; then
+  if which gpgconf >/dev/null 2>&1 ; then
+    # This might clobber SSH_AUTH_SOCK anyway...
+    GPG_AGENT_INFO=$(gpgconf --list-dirs agent-socket)
+    SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+    export GPG_AGENT_INFO
+    export SSH_AUTH_SOCK
+  fi
+fi
+
 # check if another agent is running
 if ! gpg-connect-agent --agent-program /dev/null --quiet /bye > /dev/null 2> /dev/null; then
-    if which gpgconf ; then
-        # This might clobber SSH_AUTH_SOCK anyway...
-        GPG_AGENT_INFO=$(gpgconf --list-dirs agent-socket)
-        SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-        export GPG_AGENT_INFO
-        export SSH_AUTH_SOCK
     # source settings of old agent, if applicable
-    elif [ -f "${GPG_ENV}" ]; then
+    if [ -f "${GPG_ENV}" ]; then
         # This can be clobbered by the file
         local OLD_SSH_AUTH_SOCK=${SSH_AUTH_SOCK}
         . ${GPG_ENV} > /dev/null