From 2c87f85ad56663c322f6a72f4ef6ad70b74c8aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Czocha=C5=84ski?= <czochanski@gmail.com>
Date: Wed, 8 Nov 2017 23:02:38 +0100
Subject: [PATCH] Fix wrong $GNUPGHOME usage in gpg-agent plugin (#6403)

$GNUPGHOME variable was used incorrectly and caused a grep error when
set.
---
 plugins/gpg-agent/gpg-agent.plugin.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/gpg-agent/gpg-agent.plugin.zsh b/plugins/gpg-agent/gpg-agent.plugin.zsh
index 0bf65d58f..69e239ccf 100644
--- a/plugins/gpg-agent/gpg-agent.plugin.zsh
+++ b/plugins/gpg-agent/gpg-agent.plugin.zsh
@@ -6,7 +6,7 @@ if [ ! -S $GPG_AGENT_SOCKET ]; then
 fi
 
 # Set SSH to use gpg-agent if it is configured to do so
-GNUPGCONFIG=${GNUPGHOME:-"$HOME/.gnupg/gpg-agent.conf"}
+GNUPGCONFIG="${GNUPGHOME:-"$HOME/.gnupg"}/gpg-agent.conf"
 if [ -r "$GNUPGCONFIG" ] && grep -q enable-ssh-support "$GNUPGCONFIG"; then
   unset SSH_AGENT_PID
   export SSH_AUTH_SOCK=$GPG_AGENT_SOCKET