Merge branch 'master' of git.friedersdorff.com:max/dotfiles

[max/dotfiles.git] / bash / .bashrc

diff --git a/bash/.bashrc b/bash/.bashrc
index c58049c1966f8934c922f0f2ebd81633efe1a8df..dd39849bfcb7f7a6d98dcbc9def4ebbd20a6f0fd 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -123,14 +123,14 @@ function __prompt_command()
 }
 PROMPT_COMMAND=__prompt_command
 
-GPG_TTY=$(tty)
-export GPG_TTY
-
-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")
+if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
+  gpg-connect-agent /bye >/dev/null 2>&1
 fi
 
-gpg-connect-agent udatestartuptty /bye >/dev/null
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+    export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh
+fi
 
+export GPG_TTY=($tty)
+gpg-connect-agent updatestartuptty /bye > /dev/null