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

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

diff --git a/bash/.bashrc b/bash/.bashrc
index dbf95c3bcf3f5473cbf00cca2aaefad8e3f3e989..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
@@ -92,7 +94,7 @@ function __prompt_command()
     if [[ "$git_status" =~ nothing\ to\ commit ]]; then
       local Color_On=$GREEN
     elif [[ "$git_status" =~ nothing\ added\ to\ commit\ but\ untracked\ files\ present ]]; then
-      local Color_On=$PURPLE
+      local Color_On=$CYAN
     else
       local Color_On=$RED
     fi
@@ -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)