Fix things

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

diff --git a/bash/.bashrc b/bash/.bashrc
index 8d4422e7df195a31597f62d59f02678de5f5547c..dd39849bfcb7f7a6d98dcbc9def4ebbd20a6f0fd 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -124,16 +124,13 @@ 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
+  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)
-
-# 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"
+    export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh
 fi
 
-gpg-connect-agent udatestartuptty /bye >/dev/null
+export GPG_TTY=($tty)
+gpg-connect-agent updatestartuptty /bye > /dev/null