X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bashrc;h=d9e59b2c92964b995e9d22e2d1b041d7b41a2d9f;hb=780545c9f59b56a59aba353193d9e63ac6f85109;hp=c58049c1966f8934c922f0f2ebd81633efe1a8df;hpb=268aad1e938a9edba1dfc459791a21b7e867cec6;p=max%2Fdotfiles.git

diff --git a/bash/.bashrc b/bash/.bashrc
index c58049c..d9e59b2 100644
--- 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
@@ -79,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"
@@ -115,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
@@ -123,14 +125,14 @@ function __prompt_command()
 }
 PROMPT_COMMAND=__prompt_command
 
-GPG_TTY=$(tty)
-export GPG_TTY
-
-if ! pgrep -x -u "${USER}" gpg-agent>/dev/null 2>&1; then
-    eval $(gpg-agent --daemon \
-		     --use-standard-socket \
-		     --write-env-file "${HOME}/.gpg-agent-info")
+if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
+  gpg-connect-agent /bye >/dev/null 2>&1
 fi
 
-gpg-connect-agent udatestartuptty /bye >/dev/null
+unset SSH_AGENT_PID
+if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+  export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+fi
 
+export GPG_TTY=($tty)
+gpg-connect-agent updatestartuptty /bye > /dev/null