X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=sys%2Fbashrc;h=e2f26287c9826d0f128ebd41a8a4f09e5311d831;hb=bac478d535aa3836eedc6d83e57406e802eeaf46;hp=2e81d0a49ea27ac3e1237c444eb495bd6f2765d6;hpb=c30d513f0f15d2554b332786002e2bbba43248a1;p=ConfigScripts.git

diff --git a/sys/bashrc b/sys/bashrc
index 2e81d0a..e2f2628 100644
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -1,19 +1,25 @@
 #
 # /etc/bash.bashrc: System-wide rc file for interactive bash(1) shells.
-# Written 2003-2013 by Alexander Barton (alex@barton.de)
+# Written 2003-2014 by Alexander Barton (alex@barton.de)
 #
 
-[ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
+[ -e ~/.ConfigScripts.debug ] && echo " .. /etc/bash.bashrc ..."
 
 BASHRCREAD="true"
 
 [ -z "$PROFILEREAD" -a -r /etc/profile ] && source /etc/profile
+[ -z "$PROFILEREAD" -a -r ~/.etc/profile ] && source ~/.etc/profile
+
+[ -e ~/.ConfigScripts.debug ] && echo " >> /etc/bash.bashrc ..."
 
 # Interactive shell?
 [ "$PS1" ] || return
 
+# Initialize keychain(1) ssh-agent and gpg-agent helper
+type -t keychain >/dev/null \
+	&& eval `keychain --agents ssh --eval --quick --quiet`
+
 # Common command aliases (1/2)
-alias ","="clear && logout"
 alias ".."="cd .."
 alias "ls"="ls -F"
 alias "ll"="ls -l"
@@ -108,17 +114,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_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 -t __git_ps1 >/dev/null \
 	&& PS1="\$(__git_ps1 '(${COLOR_VCS}%s${COLOR_RESET}) ')${PS1}"
 PS1="${chroot_name:+[${COLOR_CHROOT}$chroot_name${COLOR_RESET}] }${PS1}"
 PS1="${COLOR_RESET}${PS1}"
@@ -142,7 +148,7 @@ fi
 alias "lasth"="last | head -n \`expr \\\$LINES - 2\`"
 
 # Aliases for screen(1), if installed
-type -p screen >/dev/null 2>&1
+type -t screen >/dev/null
 if [ $? -eq 0 ]; then
 	alias "s"="screen"
 	alias "sr"="screen -dr"
@@ -150,15 +156,16 @@ if [ $? -eq 0 ]; then
 fi
 
 # less(1) filter, if available
-type -p lesspipe >/dev/null 2>&1 && eval `lesspipe`
+type -t lesspipe >/dev/null \
+	&& 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 -t cleanscore >/dev/null \
+	&& 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 -t dircolors >/dev/null && eval `dircolors -b`
 	ls --color / >/dev/null 2>&1
 	if [ $? -eq 0 ]; then
 		# "GNU style"
@@ -175,7 +182,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"'
 	;;
 *)
 	;;
@@ -184,6 +191,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-