X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=bash%2F.bashrc;h=249787cff3aff307933010d97dcb383294d03c4d;hb=1b17ece26e2019c0d2d2eb3d612e2dff5cca0169;hp=8d4422e7df195a31597f62d59f02678de5f5547c;hpb=f7c25419b7c83b5886af9b9a1670ffb1a6b22288;p=max%2Fdotfiles.git

diff --git a/bash/.bashrc b/bash/.bashrc
index 8d4422e..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
@@ -124,16 +128,13 @@ function __prompt_command()
 PROMPT_COMMAND=__prompt_command
 
 if ! pgrep -x -u "${USER}" gpg-agent >/dev/null 2>&1; then
-    gpg-connect-agent /bye >/dev/null 2>&1
+  gpg-connect-agent /bye >/dev/null 2>&1
 fi
 
-export GPG_AGENT_INFO="${GNUPGHOME:-${HOME}/.gnupg}/S.gpg-agent:-1:1"
-export GPG_TTY=$(tty)
-
-# Use gpg-agent for SSH
 unset SSH_AGENT_PID
 if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-    export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
+    export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh
 fi
 
-gpg-connect-agent udatestartuptty /bye >/dev/null
+export GPG_TTY=($tty)
+gpg-connect-agent updatestartuptty /bye > /dev/null