From b7f8156192e65f4e9593d0d85f4ee79efea3c548 Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Fri, 18 Nov 2016 12:37:41 +0000
Subject: [PATCH] Start gpg-agent for gnupg2.0

---
 bash/.bashrc | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index 8d4422e..c58049c 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -123,17 +123,14 @@ function __prompt_command()
 }
 PROMPT_COMMAND=__prompt_command
 
-if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
-    gpg-connect-agent /bye >/dev/null 2>&1
-fi
-
-export GPG_AGENT_INFO="${GNUPGHOME:-${HOME}/.gnupg}/S.gpg-agent:-1:1"
-export GPG_TTY=$(tty)
+GPG_TTY=$(tty)
+export GPG_TTY
 
-# Use gpg-agent for SSH
-unset SSH_AGENT_PID
-if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-    export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
+if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
+    eval $(gpg-agent --daemon \
+		     --use-standard-socket \
+		     --write-env-file "${HOME}/.gpg-agent-info")
 fi
 
 gpg-connect-agent udatestartuptty /bye >/dev/null
+
-- 
2.46.2