Update shell history handling

[ConfigScripts.git] / sys / bashrc

diff --git a/sys/bashrc b/sys/bashrc
index c32791c66f60ee614808aa7d0000de5867f5c3ab..91e94a48d906c19acf2d921a58662cdf947a1ea0 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -1,6 +1,6 @@
 #
 # /etc/bash.bashrc: System-wide rc file for interactive bash(1) shells.
-# Written 2003-2010 by Alexander Barton (alex@barton.de)
+# Written 2003-2013 by Alexander Barton (alex@barton.de)
 #
 
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
@@ -12,13 +12,35 @@ BASHRCREAD="true"
 # Interactive shell?
 [ "$PS1" ] || return
 
-# Shell options
-shopt -s checkwinsize
-shopt -s cdspell
-shopt -s histappend
+# Common command aliases (1/2)
+alias ","="clear && logout"
+alias ".."="cd .."
+alias "ls"="ls -F"
+alias "ll"="ls -l"
+alias "l"="ll -a"
+
+# Shell options (1/2)
 set mark-directories on
 set mark-symlinked-directories on
 HISTCONTROL=ignoredups
+HISTSIZE=500
+HISTFILESIZE=2000
+
+# Shell prompt
+PS1="\u@\h:\w \$ "
+
+# Make sure that the following commands are only run with bash >= 2.x
+case "$BASH_VERSION" in
+       "0."*|"1."*) return; ;;
+       *)
+esac
+
+# Shell options (2/2)
+shopt -s checkwinsize
+shopt -s cdspell
+shopt -s histappend
+shopt -s histreedit
+shopt -s histverify
 
 # Shell functions
 sshnew() {
@@ -31,9 +53,19 @@ sshtmp() {
 # Colors
 case "$TERM" in
        ansi|cons25|cygwin|dtterm|linux|rxvt|screen*|vt100|vt200|vt220|vt320| \
-       xterm|xterm-color)
+       xterm|xterm-color|xterm-256color)
                # color terminal
 
+               # terminal attributes
+               #   0: reset / 1: bright / 2: dim / 4: underline / 5: blink /
+               #   7: reverse / 8: hidden.
+               # foreground colors
+               #   30: black / 31: red / 32: green / 33: yellow / 34: blue /
+               #   35: magenta / 36: cyan / 37: white
+               # background colors
+               #   40: black / 41: red / 42: green / 43: yellow / 44: blue /
+               #   45: magenta / 46: cyan / 47: white
+
                # colors for shell prompt etc.
                COLOR_RESET="\[\e[0m\]"
                COLOR_PREPOSTTXT="\[\e[1;37m\]"
@@ -56,22 +88,38 @@ case "$TERM" in
                export LESS_TERMCAP_us=$'\E[1;32m'
 esac
 
-# Shell prompt
-[ "$UID" -eq 0 ] \
-       && PS1="\h:\w \\\$ " \
-       || PS1="\u@\h:\w \\\$ "
-if [ "\$(type -t __git_ps1)" ]; then
-       PS1="\$(__git_ps1 '(%s) ')$PS1"
+# Enable bash completion, if available
+if ! shopt -oq posix; then
+       [ -z "$BASH_COMPLETION" -a -r /etc/bash_completion ] \
+               && source /etc/bash_completion
+       [ -z "$BASH_COMPLETION" -a -r /usr/local/etc/bash_completion ] \
+               && source /usr/local/etc/bash_completion
+       [ -z "$BASH_COMPLETION" -a -r /opt/homebrew/etc/bash_completion ] \
+               && source /opt/homebrew/etc/bash_completion
+       [ -z "$BASH_COMPLETION" -a -r /opt/local/etc/bash_completion ] \
+               && source /opt/local/etc/bash_completion
 fi
-PS1="${chroot_name:+[$chroot_name] }$PS1"
 
-# Enable bash completion, if available
-[ -z "$BASH_COMPLETION" -a -r /etc/bash_completion ] \
-       && source /etc/bash_completion
-[ -z "$BASH_COMPLETION" -a -r /opt/homebrew/etc/bash_completion ] \
-       && source /opt/homebrew/etc/bash_completion
-[ -z "$BASH_COMPLETION" -a -r /opt/local/etc/bash_completion ] \
-       && source /opt/local/etc/bash_completion
+# Shell prompt
+PS1_Path() {
+       P="${PWD/$HOME/~}"
+       echo "${P/???????????????????????????????*/${P:0:8}...${P: -20}}"
+}
+
+PS1="${COLOR_PREPOSTTXT}${PS1_BEGIN:-<}"
+[ "$UID" -eq 0 ] \
+       || 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_PREPOSTTXT}${PS1_END:->}${COLOR_RESET} "
+[ "$UID" -eq 0 ] \
+       && PS1="${PS1}${COLOR_PROMPT_ROOT}\\\$${COLOR_RESET} " \
+       || PS1="${PS1}${COLOR_PROMPT_USER}\\\$${COLOR_RESET} "
+[ "$(type -t __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}"
 
 # If the command-not-found package is installed, use it
 if [ -r /etc/bash_command_not_found ]; then
@@ -88,12 +136,7 @@ elif [ -x /usr/lib/command-not-found ]; then
        }
 fi
 
-# Common command aliases
-alias ","="clear && logout"
-alias ".."="cd .."
-alias "ls"="ls -F"
-alias "ll"="ls -l"
-alias "l"="ll -a"
+# Common command aliases (2/2)
 alias "lasth"="last | head -n \`expr \\\$LINES - 2\`"
 
 # Aliases for screen(1), if installed
@@ -107,14 +150,6 @@ fi
 # less(1) filter, if available
 type -p lesspipe >/dev/null 2>&1 && eval `lesspipe`
 
-# Initialize ccache(1), if installed
-if [ -d "/usr/lib/ccache" ]; then
-       PATH="/usr/lib/ccache:$PATH"
-       # Set the cache directory to local storage, if available
-       [ -w "/usr/local/home/$USER" ] \
-               && export CCACHE_DIR="/usr/local/home/$USER/.ccache"
-fi
-
 # Setup slrn(1) and cleanscore(1), if installed
 type -p cleanscore >/dev/null 2>&1
 [ $? -eq 0 ] && alias slrn="cleanscore -f ~/.slrnscore && slrn"