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

diff --git a/sys/bashrc b/sys/bashrc
index fe509e3..911327f 100644
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -1,44 +1,49 @@
 #
 # /etc/bash.bashrc: System-wide rc file for interactive bash(1) shells.
-#
-# 2008-08-07, alex@barton.de
-#  - ls: Detech BSD color support (-G).
-#  - Support /etc/chroot_name
-# 2008-07-09, alex@barton.de
-#  - Added support for /usr/lib/command-not-found.
-# 2008-06-06, alex@barton.de
-#  - Source /etc/[bash].bashrc.local as well, if readable.
-# 2007-04-05, alex@barton.de
-#  - Define shell functions sshtmp() and sshnew().
-# 2006-01-04, alex@barton.de
-#  - Only call dircolors(1) and lesspipe(1) if they are available.
-#  - Check wether ls(1) knows something about "--color".
-# 2005-12-29, alex@barton.de
-#  - Enabled bash completion
-# 2004-09-13, alex@Arthur.Ath.CX
-#  - Made script more generic ...
-# 2004-05-27, alex@Arthur.Ath.CX
+# Written 2003-2014 by Alexander Barton (alex@barton.de)
 #
 
-[ -e /tmp/ConfigDebug.$USER ] && echo " >> /etc/bash.bashrc ..."
+[ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
 
 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?
-if [ ! "$PS1" ]; then
-	[ -r "/var/lib/$ME/bash.bashrc" ] && source /var/lib/$ME/bash.bashrc
-	return
-fi
+[ "$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() {
@@ -48,17 +53,83 @@ sshtmp() {
 	ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" "$@"
 }
 
-# Shell prompt
-prefix="${chroot_name:+($chroot_name)}"
-[ "$UID" -eq 0 ] \
-	&& PS1="${prefix}\h:\w \\\$ " \
-	|| PS1="${prefix}\u@\h:\w \\\$ "
+# Colors
+case "$TERM" in
+	ansi|cons25|cygwin|dtterm|linux|rxvt|screen*|vt100|vt200|vt220|vt320| \
+	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\]"
+		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\]"
+		COLOR_HISTORY=$reset
+
+		# 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
 
 # Enable bash completion, if available
-[ -r /etc/bash_completion ] && source /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() {
+	P="${PWD/$HOME/~}"
+	echo "${P/???????????????????????????????*/${P:0:8}...${P: -20}}"
+}
+
+PS1="${COLOR_PREPOSTTXT}${PS1_BEGIN:-<}"
+[ "$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_HISTORY}\!"
+PS1="${PS1}${COLOR_PREPOSTTXT}${PS1_END:->}${COLOR_RESET} "
+[ "$LOGNAME" = "root" ] \
+	&& PS1="${PS1}${COLOR_PROMPT_ROOT}\\\$${COLOR_RESET} " \
+	|| PS1="${PS1}${COLOR_PROMPT_USER}\\\$${COLOR_RESET} "
+[ "$(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}"
 
 # If the command-not-found package is installed, use it
-if [ -x /usr/lib/command-not-found ]; then
+if [ -r /etc/bash_command_not_found ]; then
+	. /etc/bash_command_not_found
+elif [ -x /usr/lib/command-not-found ]; then
 	function command_not_found_handle {
 		# Check because c-n-f could've been removed in the meantime
 		if [ -x /usr/lib/command-not-found ]; then
@@ -70,20 +141,28 @@ if [ -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\`"
 
-# less filter
-type -p lesspipe >/dev/null 2>&1 && eval `lesspipe`
+# Aliases for screen(1), if installed
+type screen >/dev/null 2>&1
+if [ $? -eq 0 ]; then
+	alias "s"="screen"
+	alias "sr"="screen -dr"
+	alias "sx"="screen -x"
+fi
+
+# less(1) filter, if available
+type lesspipe >/dev/null 2>&1 \
+	&& eval `lesspipe`
+
+# Setup slrn(1) and cleanscore(1), if installed
+type cleanscore >/dev/null 2>&1 \
+	&& alias slrn="cleanscore -f ~/.slrnscore && slrn"
 
-# Enable color support of ls 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"
@@ -100,7 +179,7 @@ fi
 # If this is an xterm set the title to user@host:dir
 case $TERM in
 xterm*|rxvt|screen)
-	PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}: ${PWD}\007"'
+	PROMPT_COMMAND='printf "\033]0;${LOGNAME}@${HOSTNAME}: ${PWD}\007"'
 	;;
 *)
 	;;
@@ -109,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-