X-Git-Url: https://arthur.barton.de/gitweb/?a=blobdiff_plain;f=sys%2Fbashrc;h=911327fde5db176465cdb5f1cc6c925825742fc5;hb=f3abe3aedbb390e92d94357f86acd37c442565a8;hp=73a3bbd8b3de61dcc4d3bb44c8c64deb064de495;hpb=59b5a5b387733b4a72510aa1c6c1090bbef3eb18;p=ConfigScripts.git

diff --git a/sys/bashrc b/sys/bashrc
index 73a3bbd..911327f 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-2014 by Alexander Barton (alex@barton.de)
 #
 
 [ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
@@ -9,16 +9,41 @@ BASHRCREAD="true"
 
 [ -z "$PROFILEREAD" -a -r /etc/profile ] && source /etc/profile
 
+# Initialize keychain(1) ssh-agent and gpg-agent helper
+type keychain >/dev/null 2>&1 \
+	&& eval `keychain --agents ssh --eval --quick --quiet`
+
 # Interactive shell?
 [ "$PS1" ] || return
 
-# Shell options
-shopt -s checkwinsize
-shopt -s cdspell
-shopt -s histappend
+# Common command aliases (1/2)
+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,7 +56,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
@@ -55,6 +80,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'
@@ -67,12 +93,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() {
@@ -81,16 +111,17 @@ PS1_Path() {
 }
 
 PS1="${COLOR_PREPOSTTXT}${PS1_BEGIN:-<}"
-[ "$UID" -eq 0 ] \
+[ "$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}\$(PS1_Path) "
+PS1="${PS1}${COLOR_HISTORY}\!"
 PS1="${PS1}${COLOR_PREPOSTTXT}${PS1_END:->}${COLOR_RESET} "
-[ "$UID" -eq 0 ] \
+[ "$LOGNAME" = "root" ] \
 	&& PS1="${PS1}${COLOR_PROMPT_ROOT}\\\$${COLOR_RESET} " \
 	|| PS1="${PS1}${COLOR_PROMPT_USER}\\\$${COLOR_RESET} "
-[ "$(type -t __git_ps1)" ] \
+[ "$(type __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}"
@@ -110,16 +141,11 @@ 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
-type -p screen >/dev/null 2>&1
+type screen >/dev/null 2>&1
 if [ $? -eq 0 ]; then
 	alias "s"="screen"
 	alias "sr"="screen -dr"
@@ -127,23 +153,16 @@ if [ $? -eq 0 ]; then
 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
+type lesspipe >/dev/null 2>&1 \
+	&& eval `lesspipe`
 
 # Setup slrn(1) and cleanscore(1), if installed
-type -p cleanscore >/dev/null 2>&1
-[ $? -eq 0 ] && alias slrn="cleanscore -f ~/.slrnscore && slrn"
+type cleanscore >/dev/null 2>&1 \
+	&& alias slrn="cleanscore -f ~/.slrnscore && slrn"
 
-# Enable color support of ls(1) and also add handy aliases
+# Enable color support of ls(1)
 if [ "$TERM" != "dumb" ]; then
-	type -p dircolors >/dev/null 2>&1 && eval `dircolors -b`
+	type dircolors >/dev/null 2>&1 && eval `dircolors -b`
 	ls --color / >/dev/null 2>&1
 	if [ $? -eq 0 ]; then
 		# "GNU style"
@@ -160,7 +179,7 @@ fi
 # If this is an xterm set the title to user@host:dir
 case $TERM in
 xterm*|rxvt|screen)
-	PROMPT_COMMAND='printf "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
+	PROMPT_COMMAND='printf "\033]0;${LOGNAME}@${HOSTNAME}: ${PWD}\007"'
 	;;
 *)
 	;;
@@ -169,6 +188,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-