Correctly set SSH_AGENT_SOCKET

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

diff --git a/bash/.bashrc b/bash/.bashrc
index 249787cff3aff307933010d97dcb383294d03c4d..d9e59b2c92964b995e9d22e2d1b041d7b41a2d9f 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -83,22 +83,20 @@ function __prompt_command()
 
   # check if inside git repo
   local git_status="`git status -unormal 2>&1`"    
-  if ! [[ "$git_status" =~ Not\ a\ git\ repo ]]; then
+  if git rev-parse --git-dir > /dev/null 2>&1; then
+    git_status=$(git status --porcelain)
     # parse the porcelain output of git status
-    if [[ "$git_status" =~ nothing\ to\ commit ]]; then
+    if [[ ! $git_status = *[![:space:]]* ]]; then
       local Color_On=$GREEN
-    elif [[ "$git_status" =~ nothing\ added\ to\ commit\ but\ untracked\ files\ present ]]; then
+    elif [[ $git_status =~ ^\?\? ]]; then
       local Color_On=$CYAN
     else
       local Color_On=$RED
     fi
 
-    if [[ "$git_status" =~ On\ branch\ ([^[:space:]]+) ]]; then
-      branch=${BASH_REMATCH[1]}
-    else
-      # Detached HEAD. (branch=HEAD is a faster alternative.)
-      branch="(`git describe --all --contains --abbrev=4 HEAD 2> /dev/null || echo HEAD`)"
-    fi
+    branch=$(git symbolic-ref -q HEAD)
+    branch=${branch##refs/heads/}
+    branch=${branch:-HEAD}
 
     # add the result to prompt
     PS1+="\n\[$Color_On\][$branch]\[$RESET\]\n"
@@ -119,7 +117,7 @@ function __prompt_command()
   PS1+="${debian_chroot:+($debian_chroot)}"
 
   # basic information (user@host:path)
-  PS1+="\[$RED$BOLD\]\u\[$RESET\]@\[$RED$BOLD\]\h\[$RESET\]:\[$BLUE\]\w\[$RESET\] "
+  PS1+="\[$RED$BOLD\]\u\[$RESET\]@\[$RED$BOLD\]\h\[$RESET\]:\[$BLUE\]\w\[$RESET\]\n"
 
   
   # prompt $ or # for root
@@ -133,7 +131,7 @@ fi
 
 unset SSH_AGENT_PID
 if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-    export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh
+  export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
 fi
 
 export GPG_TTY=($tty)