X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bashrc;h=249787cff3aff307933010d97dcb383294d03c4d;hb=c9b3fc98092322d98d4aac2ac9ada0bad743d6a7;hp=c58049c1966f8934c922f0f2ebd81633efe1a8df;hpb=b7f8156192e65f4e9593d0d85f4ee79efea3c548;p=max%2Fdotfiles.git

diff --git a/bash/.bashrc b/bash/.bashrc
index c58049c..249787c 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
@@ -123,14 +127,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=~/.gnupg/S.gpg-agent.ssh
+fi
 
+export GPG_TTY=($tty)
+gpg-connect-agent updatestartuptty /bye > /dev/null