X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sys%2Fbashrc;h=c19746b1ffcea0a2b48215e07c49f31fe3d28851;hb=b13b36e4587f7895d7d5f0acc98bf9d45b31b46e;hp=96c191808d32198251fc60ff603199931c8810ce;hpb=40ec1a0e40e4fa0e55ea496b01761ec0a8d761d7;p=ConfigScripts.git

diff --git a/sys/bashrc b/sys/bashrc
index 96c1918..c19746b 100644
--- 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-2012 by Alexander Barton (alex@barton.de)
 #
 
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
@@ -12,14 +12,32 @@ 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
 
+# 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
+
 # Shell functions
 sshnew() {
 	ssh -o "StrictHostKeyChecking no" "$@"
@@ -31,7 +49,7 @@ 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
@@ -66,6 +84,18 @@ case "$TERM" in
 		export LESS_TERMCAP_us=$'\E[1;32m'
 esac
 
+# 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
+
 # Shell prompt
 PS1_Path() {
 	P="${PWD/$HOME/~}"
@@ -82,19 +112,11 @@ 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)" ] \
+[ "$(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}"
 
-# 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 the command-not-found package is installed, use it
 if [ -r /etc/bash_command_not_found ]; then
 	. /etc/bash_command_not_found
@@ -110,12 +132,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
@@ -129,14 +146,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"