X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sys%2Fbashrc;h=c32791c66f60ee614808aa7d0000de5867f5c3ab;hb=424e85634a486ba8211ecfe8f3a2680a3666a0d8;hp=4ebf424cbfc875950e908d37df729815f7cc1e62;hpb=1c281d6cd95878b291202684697b64c1bcd57e4f;p=ConfigScripts.git

diff --git a/sys/bashrc b/sys/bashrc
index 4ebf424..c32791c 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-2009 by Alexander Barton (alex@barton.de)
+# Written 2003-2010 by Alexander Barton (alex@barton.de)
 #
 
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
@@ -10,10 +10,7 @@ BASHRCREAD="true"
 [ -z "$PROFILEREAD" -a -r /etc/profile ] && source /etc/profile
 
 # Interactive shell?
-if [ ! "$PS1" ]; then
-	[ -r "/var/lib/$ME/bash.bashrc" ] && source /var/lib/$ME/bash.bashrc
-	return
-fi
+[ "$PS1" ] || return
 
 # Shell options
 shopt -s checkwinsize
@@ -31,15 +28,48 @@ sshtmp() {
 	ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" "$@"
 }
 
+# Colors
+case "$TERM" in
+	ansi|cons25|cygwin|dtterm|linux|rxvt|screen*|vt100|vt200|vt220|vt320| \
+	xterm|xterm-color)
+		# color terminal
+
+		# colors for shell prompt etc.
+		COLOR_RESET="\[\e[0m\]"
+		COLOR_PREPOSTTXT="\[\e[1;37m\]"
+		COLOR_USER="\[\e[0;4m\]"
+		COLOR_AT="\[\e[0;37m\]"
+		COLOR_HOST="\[\e[0;4m\]"
+		COLOR_COLON="\[\e[0;37m\]"
+		COLOR_PATH=$reset
+		COLOR_PROMPT_USER="\[\e[1;32m\]"
+		COLOR_PROMPT_ROOT="\[\e[1;31m\]"
+		COLOR_VCS="\[\e[1;33m\]"
+
+		# colors for less(1) pager
+		export LESS_TERMCAP_mb=$'\E[1;33m'
+		export LESS_TERMCAP_md=$'\E[1;31m'
+		export LESS_TERMCAP_me=$'\E[0m'
+		export LESS_TERMCAP_se=$'\E[0m'
+		export LESS_TERMCAP_so=$'\E[1;33;44m'
+		export LESS_TERMCAP_ue=$'\E[0m'
+		export LESS_TERMCAP_us=$'\E[1;32m'
+esac
+
 # Shell prompt
-prefix="${chroot_name:+($chroot_name)}"
 [ "$UID" -eq 0 ] \
-	&& PS1="${prefix}\h:\w \\\$ " \
-	|| PS1="${prefix}\u@\h:\w \\\$ "
+	&& PS1="\h:\w \\\$ " \
+	|| PS1="\u@\h:\w \\\$ "
+if [ "\$(type -t __git_ps1)" ]; then
+	PS1="\$(__git_ps1 '(%s) ')$PS1"
+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