Fix detection of "desktop sessions"

[ConfigScripts.git] / sys / bashrc

diff --git a/sys/bashrc b/sys/bashrc
index a49c425e5584a642ebbf114a8e00bc4f3f832039..2e81d0a49ea27ac3e1237c444eb495bd6f2765d6 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-2011 by Alexander Barton (alex@barton.de)
+# Written 2003-2013 by Alexander Barton (alex@barton.de)
 #
 
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
@@ -23,11 +23,13 @@ alias "l"="ll -a"
 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 >= 3.x
+# Make sure that the following commands are only run with bash >= 2.x
 case "$BASH_VERSION" in
        "0."*|"1."*) return; ;;
        *)
@@ -37,6 +39,8 @@ esac
 shopt -s checkwinsize
 shopt -s cdspell
 shopt -s histappend
+shopt -s histreedit
+shopt -s histverify
 
 # Shell functions
 sshnew() {
@@ -73,6 +77,7 @@ case "$TERM" in
                COLOR_PROMPT_USER="\[\e[1;32m\]"
                COLOR_PROMPT_ROOT="\[\e[1;31m\]"
                COLOR_VCS="\[\e[1;33m\]"
+               COLOR_HISTORY=$reset
 
                # colors for less(1) pager
                export LESS_TERMCAP_mb=$'\E[1;33m'
@@ -85,12 +90,16 @@ case "$TERM" in
 esac
 
 # 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
+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
 
 # Shell prompt
 PS1_Path() {
@@ -103,7 +112,8 @@ PS1="${COLOR_PREPOSTTXT}${PS1_BEGIN:-<}"
        || 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}\$(PS1_Path) "
+PS1="${PS1}${COLOR_HISTORY}\!"
 PS1="${PS1}${COLOR_PREPOSTTXT}${PS1_END:->}${COLOR_RESET} "
 [ "$UID" -eq 0 ] \
        && PS1="${PS1}${COLOR_PROMPT_ROOT}\\\$${COLOR_RESET} " \
@@ -142,14 +152,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"