Add more debug output to sys/bashrc

[ConfigScripts.git] / sys / bashrc

diff --git a/sys/bashrc b/sys/bashrc
index b65ff999af1d3101596266a03566331fa24e0565..0c49948d5dcda9ba94490b9f9b07007f0909f2ef 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -1,16 +1,27 @@
 #
 # /etc/bash.bashrc: System-wide rc file for interactive bash(1) shells.
-# Written 2003-2014 by Alexander Barton (alex@barton.de)
+# Written 2003-2015 by Alexander Barton (alex@barton.de)
 #
 
-[ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
+[ -e ~/.ConfigScripts.debug ] && echo " .. /etc/bash.bashrc ..."
 
 BASHRCREAD="true"
 
 [ -z "$PROFILEREAD" -a -r /etc/profile ] && source /etc/profile
+[ -z "$PROFILEREAD" -a -r ~/.etc/profile ] && source ~/.etc/profile
+
+[ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
 
 # Interactive shell?
-[ "$PS1" ] || return
+case "$-" in
+       *i*) ;;
+       *) return ;;
+esac
+
+# Initialize keychain(1) ssh-agent and gpg-agent helper
+[ -e ~/.ConfigScripts.debug ] && echo "     - keychain ..."
+type -t keychain >/dev/null \
+       && eval `keychain --agents ssh --eval --quick --quiet`
 
 # Common command aliases (1/2)
 alias ".."="cd .."
@@ -35,6 +46,7 @@ case "$BASH_VERSION" in
 esac
 
 # Shell options (2/2)
+[ -e ~/.ConfigScripts.debug ] && echo "     - shell options ..."
 shopt -s checkwinsize
 shopt -s cdspell
 shopt -s histappend
@@ -49,7 +61,12 @@ sshtmp() {
        ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" "$@"
 }
 
+# Map up & down to history search once a command has been started
+bind '"\e[A":history-search-backward'
+bind '"\e[B":history-search-forward'
+
 # Colors
+[ -e ~/.ConfigScripts.debug ] && echo "     - colors ..."
 case "$TERM" in
        ansi|cons25|cygwin|dtterm|linux|rxvt|screen*|vt100|vt200|vt220|vt320| \
        xterm|xterm-color|xterm-256color)
@@ -90,6 +107,7 @@ esac
 
 # Enable bash completion, if available
 if ! shopt -oq posix; then
+       [ -e ~/.ConfigScripts.debug ] && echo "     - bash completion ..."
        [ -z "$BASH_COMPLETION" -a -r /etc/bash_completion ] \
                && source /etc/bash_completion
        [ -z "$BASH_COMPLETION" -a -r /usr/local/etc/bash_completion ] \
@@ -100,29 +118,31 @@ if ! shopt -oq posix; then
                && source /opt/local/etc/bash_completion
 fi
 
-# Shell prompt
-PS1_Path() {
-       P="${PWD/$HOME/~}"
-       echo "${P/???????????????????????????????*/${P:0:8}...${P: -20}}"
-}
+# Enable local virtualenvwrapper installation, if available
+[ -e ~/.ConfigScripts.debug ] && echo "     - virtualenvwrapper ..."
+[ -r /usr/local/bin/virtualenvwrapper.sh ] \
+       && source /usr/local/bin/virtualenvwrapper.sh
 
+# Shell prompt
+[ -e ~/.ConfigScripts.debug ] && echo "     - prompt ..."
 PS1="${COLOR_PREPOSTTXT}${PS1_BEGIN:-<}"
 [ "$LOGNAME" = "root" ] \
        || PS1="${PS1}${COLOR_USER}\u${COLOR_AT}@"
 PS1="${PS1}${COLOR_HOST}\h"
 PS1="${PS1}${COLOR_COLON}:"
-PS1="${PS1}${COLOR_PATH}\$(PS1_Path) "
+PS1="${PS1}${COLOR_PATH}\W "
 PS1="${PS1}${COLOR_HISTORY}\!"
 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 __git_ps1)" ] \
+type -t __git_ps1 >/dev/null \
        && PS1="\$(__git_ps1 '(${COLOR_VCS}%s${COLOR_RESET}) ')${PS1}"
 PS1="${chroot_name:+[${COLOR_CHROOT}$chroot_name${COLOR_RESET}] }${PS1}"
 PS1="${COLOR_RESET}${PS1}"
 
 # If the command-not-found package is installed, use it
+[ -e ~/.ConfigScripts.debug ] && echo "     - command_not_found ..."
 if [ -r /etc/bash_command_not_found ]; then
        . /etc/bash_command_not_found
 elif [ -x /usr/lib/command-not-found ]; then
@@ -138,10 +158,12 @@ elif [ -x /usr/lib/command-not-found ]; then
 fi
 
 # Common command aliases (2/2)
+[ -e ~/.ConfigScripts.debug ] && echo "     - aliases ..."
 alias "lasth"="last | head -n \`expr \\\$LINES - 2\`"
+alias "lastf"="last | grep -v \"^\$LOGNAME\""
 
 # Aliases for screen(1), if installed
-type screen >/dev/null 2>&1
+type -t screen >/dev/null
 if [ $? -eq 0 ]; then
        alias "s"="screen"
        alias "sr"="screen -dr"
@@ -149,16 +171,16 @@ if [ $? -eq 0 ]; then
 fi
 
 # less(1) filter, if available
-type lesspipe >/dev/null 2>&1 \
+type -t lesspipe >/dev/null \
        && eval `lesspipe`
 
 # Setup slrn(1) and cleanscore(1), if installed
-type cleanscore >/dev/null 2>&1 \
+type -t cleanscore >/dev/null \
        && alias slrn="cleanscore -f ~/.slrnscore && slrn"
 
 # Enable color support of ls(1)
 if [ "$TERM" != "dumb" ]; then
-       type dircolors >/dev/null 2>&1 && eval `dircolors -b`
+       type -t dircolors >/dev/null && eval `dircolors -b`
        ls --color / >/dev/null 2>&1
        if [ $? -eq 0 ]; then
                # "GNU style"
@@ -173,6 +195,7 @@ if [ "$TERM" != "dumb" ]; then
 fi
 
 # If this is an xterm set the title to user@host:dir
+[ -e ~/.ConfigScripts.debug ] && echo "     - prompt command ..."
 case $TERM in
 xterm*|rxvt|screen)
        PROMPT_COMMAND='printf "\033]0;${LOGNAME}@${HOSTNAME}: ${PWD}\007"'
@@ -184,6 +207,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-