From 60022786c368e21740f055544634c792dacee126 Mon Sep 17 00:00:00 2001
From: Mathias Fussenegger <f.mathias@zignar.net>
Date: Thu, 27 Nov 2014 22:19:13 +0100
Subject: [PATCH] gpg: check for S.gpg-agent to see if gpg-agent is running

from gpg changelog:

>  Removed the GPG_AGENT_INFO related code.  GnuPG does now
>  always use a fixed socket name in its home directory.
---
 modules/gpg/init.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gpg/init.zsh b/modules/gpg/init.zsh
index e644b3a2..04c94ba2 100644
--- a/modules/gpg/init.zsh
+++ b/modules/gpg/init.zsh
@@ -15,7 +15,7 @@ _gpg_agent_conf="${GNUPGHOME:-$HOME/.gnupg}/gpg-agent.conf"
 _gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
 
 # Start gpg-agent if not started.
-if [[ -z "$GPG_AGENT_INFO" ]]; then
+if [[ -z "$GPG_AGENT_INFO" && ! -S "${GNUPGHOME:-$HOME/.gnupg}/S.gpg-agent" ]]; then
   # Export environment variables.
   source "$_gpg_agent_env" 2> /dev/null