Only call keychain(1) when shell is interactive

[ConfigScripts.git] / sys / bashrc

diff --git a/sys/bashrc b/sys/bashrc
index ce98922e21e8686a42e46e586a65fbbf6c9dc1ba..e3a45dc8196db3f71540e596a9a601ed79b3a501 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -12,8 +12,11 @@ BASHRCREAD="true"
 # Interactive shell?
 [ "$PS1" ] || return
 
+# Initialize keychain(1) ssh-agent and gpg-agent helper
+type keychain >/dev/null 2>&1 \
+       && eval `keychain --agents ssh --eval --quick --quiet`
+
 # Common command aliases (1/2)
-alias ","="clear && logout"
 alias ".."="cd .."
 alias "ls"="ls -F"
 alias "ll"="ls -l"
@@ -118,7 +121,7 @@ PS1="${PS1}${COLOR_PREPOSTTXT}${PS1_END:->}${COLOR_RESET} "
 [ "$LOGNAME" = "root" ] \
        && PS1="${PS1}${COLOR_PROMPT_ROOT}\\\$${COLOR_RESET} " \
        || PS1="${PS1}${COLOR_PROMPT_USER}\\\$${COLOR_RESET} "
-[ "$(type -t __git_ps1)" ] \
+[ "$(type __git_ps1)" ] \
        && PS1="\$(__git_ps1 '(${COLOR_VCS}%s${COLOR_RESET}) ')${PS1}"
 PS1="${chroot_name:+[${COLOR_CHROOT}$chroot_name${COLOR_RESET}] }${PS1}"
 PS1="${COLOR_RESET}${PS1}"
@@ -142,7 +145,7 @@ fi
 alias "lasth"="last | head -n \`expr \\\$LINES - 2\`"
 
 # Aliases for screen(1), if installed
-type -p screen >/dev/null 2>&1
+type screen >/dev/null 2>&1
 if [ $? -eq 0 ]; then
        alias "s"="screen"
        alias "sr"="screen -dr"
@@ -150,15 +153,16 @@ if [ $? -eq 0 ]; then
 fi
 
 # less(1) filter, if available
-type -p lesspipe >/dev/null 2>&1 && eval `lesspipe`
+type lesspipe >/dev/null 2>&1 \
+       && eval `lesspipe`
 
 # Setup slrn(1) and cleanscore(1), if installed
-type -p cleanscore >/dev/null 2>&1
-[ $? -eq 0 ] && alias slrn="cleanscore -f ~/.slrnscore && slrn"
+type cleanscore >/dev/null 2>&1 \
+       && alias slrn="cleanscore -f ~/.slrnscore && slrn"
 
-# Enable color support of ls(1) and also add handy aliases
+# Enable color support of ls(1)
 if [ "$TERM" != "dumb" ]; then
-       type -p dircolors >/dev/null 2>&1 && eval `dircolors -b`
+       type dircolors >/dev/null 2>&1 && eval `dircolors -b`
        ls --color / >/dev/null 2>&1
        if [ $? -eq 0 ]; then
                # "GNU style"
@@ -184,6 +188,6 @@ esac
 # Source local files, if readable
 [ -r "/etc/bashrc.local" ] && source /etc/bashrc.local
 [ -r "/etc/bash.bashrc.local" ] && source /etc/bash.bashrc.local
-[ -r "/var/lib/$ME/bash.bashrc" ] && source /var/lib/$ME/bash.bashrc
+[ -r "/var/lib/$HOSTNAME/bash.bashrc" ] && source /var/lib/$HOSTNAME/bash.bashrc
 
 # -eof-