Merge branch 'master' of github.com:maxf130/dotfiles

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

diff --git a/bash/.bashrc b/bash/.bashrc
index 3cf998a6047a9e4ca9da5f73f8a6d34be1679569..ab339cb917876f414e0e28e714f6dbf0853d8439 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -71,6 +71,8 @@ function __prompt_command()
   EXIT="$?"
   PS1=""
 
+  PS1+=$PS1_PREPEND
+
   if [ $EXIT -eq 0 ]; then PS1+="\[$GREEN\][\!]\[$RESET\] "; else PS1+="\[$RED\][\!]\[$RESET\] "; fi
 
   # if logged in via ssh shows the ip of the client
@@ -108,7 +110,19 @@ function __prompt_command()
     PS1+="\[$Color_On\][$branch]\[$RESET\] "
   fi
 
+  PS1+=$PS1_APPEND
   # prompt $ or # for root
   PS1+="\$ "
 }
 PROMPT_COMMAND=__prompt_command
+
+
+if [ -f "${HOME}/.gpg-agent-info" ]; then
+  . "${HOME}/.gpg-agent-info"
+  export GPG_AGENT_INFO
+  export SSH_AUTH_SOCK
+fi
+
+
+# Set GPG TTY
+export GPG_TTY=$(tty)