Correctly set SSH_AGENT_SOCKET

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

diff --git a/bash/.bashrc b/bash/.bashrc
index ab339cb917876f414e0e28e714f6dbf0853d8439..d9e59b2c92964b995e9d22e2d1b041d7b41a2d9f 100644 (file)
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -24,7 +24,11 @@ HISTFILESIZE=2000
 shopt -s checkwinsize
 
 # make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+if [ -x /usr/bin/lesspipe ]; then 
+  export LESSOPEN="|lesspipe %s"
+elif [ -x /usr/bin/lesspipe.sh ]; then 
+  export LESSOPEN="|lesspipe %s"
+fi
 
 # set variable identifying the chroot you work in (used in the prompt below)
 if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
@@ -64,6 +68,12 @@ GRAY=$(tput setaf 7)
 BOLD=$(tput bold)
 RESET=$(tput sgr0)
 
+function __virtualenv_prompt() {
+  if [ -n "$VIRTUAL_ENV" ]; then
+    echo "(${VIRTUAL_ENV##*/}) "
+  fi
+}
+
 # set up command prompt
 function __prompt_command()
 {
@@ -71,7 +81,29 @@ function __prompt_command()
   EXIT="$?"
   PS1=""
 
-  PS1+=$PS1_PREPEND
+  # check if inside git repo
+  local git_status="`git status -unormal 2>&1`"    
+  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 = *[![:space:]]* ]]; then
+      local Color_On=$GREEN
+    elif [[ $git_status =~ ^\?\? ]]; then
+      local Color_On=$CYAN
+    else
+      local Color_On=$RED
+    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"
+  fi
+
+
+  PS1+="$(__virtualenv_prompt)"
 
   if [ $EXIT -eq 0 ]; then PS1+="\[$GREEN\][\!]\[$RESET\] "; else PS1+="\[$RED\][\!]\[$RESET\] "; fi
 
@@ -85,44 +117,22 @@ 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"
 
-  # check if inside git repo
-  local git_status="`git status -unormal 2>&1`"    
-  if ! [[ "$git_status" =~ Not\ a\ git\ repo ]]; then
-    # parse the porcelain output of git status
-    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=$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
-
-    # add the result to prompt
-    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
+if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
+  gpg-connect-agent /bye >/dev/null 2>&1
 fi
 
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+  export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+fi
 
-# Set GPG TTY
-export GPG_TTY=$(tty)
+export GPG_TTY=($tty)
+gpg-connect-agent updatestartuptty /bye > /dev/null