X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bashrc;h=c58049c1966f8934c922f0f2ebd81633efe1a8df;hb=268aad1e938a9edba1dfc459791a21b7e867cec6;hp=8d4422e7df195a31597f62d59f02678de5f5547c;hpb=294d1ee3bc8dd0a60128109e34a9d184944af651;p=max%2Fdotfiles.git

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
+