Move order of declarations

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

diff --git a/bash/.bashrc b/bash/.bashrc
index a90c1772bfcd263c3f4303cc074baaab312d58b3..c58049c1966f8934c922f0f2ebd81633efe1a8df 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -123,13 +123,14 @@ function __prompt_command()
 }
 PROMPT_COMMAND=__prompt_command
 
+GPG_TTY=$(tty)
+export GPG_TTY
 
-if [ -f "${HOME}/.gpg-agent-info" ]; then
-  . "${HOME}/.gpg-agent-info"
-  export GPG_AGENT_INFO
-  export SSH_AUTH_SOCK
+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
 
-# Set GPG TTY
-export GPG_TTY=$(tty)