[Pkg-gnupg-commit] [gnupg2] 01/01: use simpler and more direct gpgconf invocations for socket names

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 92a4f1ca254f66481d7cde4cb8ac47c11d4424b1
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Sun Feb 5 12:42:24 2017 -0500

    use simpler and more direct gpgconf invocations for socket names
---
 debian/Xsession.d/90gpg-agent | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/Xsession.d/90gpg-agent b/debian/Xsession.d/90gpg-agent
index bc54b93..8b45b05 100644
--- a/debian/Xsession.d/90gpg-agent
+++ b/debian/Xsession.d/90gpg-agent
@@ -13,10 +13,10 @@
 # variables to be set in order to find the agent, so we will set those
 # here.
 
-agent_sock=$(gpgconf --list-dirs | grep ^agent-socket: | cut -d: -f2)
+agent_sock=$(gpgconf --list-dirs agent-socket)
 export GPG_AGENT_INFO=${agent_sock}:0:1
 if [ -n "$(gpgconf --list-options gpg-agent | \
       awk -F: '/^enable-ssh-support:/{ print $10 }')" ]; then
-    export SSH_AUTH_SOCK=${agent_sock}.ssh
+    export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 fi
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git