[Pkg-gnupg-commit] [gnupg2] 100/102: rely entirely on gpgconf for socket paths instead of trying to figure them out manually

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 19e2e26b80bc18e0bde2df777e94d2b37affeb68
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Jun 16 19:12:24 2016 -0400

    rely entirely on gpgconf for socket paths instead of trying to figure them out manually
---
 debian/Xsession.d/90gpg-agent | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/Xsession.d/90gpg-agent b/debian/Xsession.d/90gpg-agent
index 08392c3..506767f 100644
--- a/debian/Xsession.d/90gpg-agent
+++ b/debian/Xsession.d/90gpg-agent
@@ -1,12 +1,11 @@
-: ${GNUPGHOME=$HOME/.gnupg}
-
 # always launch the agent, and expose it via the environment to those
 # tools that need it:
 gpgconf --launch gpg-agent
-export GPG_AGENT_INFO=$GNUPGHOME/S.gpg-agent:0:1
+agent_sock=$(gpgconf --list-dirs | grep ^agent-socket: | cut -d: -f2)
+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=$GNUPGHOME/S.gpg-agent.ssh
+    export SSH_AUTH_SOCK=${agent_sock}.ssh
 fi
 # the downside to this approach is that the agent gets launched before
 # dbus session is initialized, so it doesn't know the native

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