Remove PAGER for environment variables

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

diff --git a/bash/.bashrc b/bash/.bashrc
index a90c1772bfcd263c3f4303cc074baaab312d58b3..249787cff3aff307933010d97dcb383294d03c4d 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
@@ -123,13 +127,14 @@ function __prompt_command()
 }
 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=~/.gnupg/S.gpg-agent.ssh
+fi
 
-# Set GPG TTY
-export GPG_TTY=$(tty)
+export GPG_TTY=($tty)
+gpg-connect-agent updatestartuptty /bye > /dev/null