Better debug logging, display when script really starts

[ConfigScripts.git] / sys / bashrc

diff --git a/sys/bashrc b/sys/bashrc
index 43358b19fc5dfdb47d8f68f73fdebc564ca7dca5..e2f26287c9826d0f128ebd41a8a4f09e5311d831 100644 (file)
--- a/sys/bashrc
+++ b/sys/bashrc
@@ -3,17 +3,23 @@
 # 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"
@@ -118,7 +124,7 @@ 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)" ] \
+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 screen >/dev/null 2>&1
+type -t screen >/dev/null
 if [ $? -eq 0 ]; then
        alias "s"="screen"
        alias "sr"="screen -dr"
@@ -150,16 +156,16 @@ if [ $? -eq 0 ]; then
 fi
 
 # less(1) filter, if available
-type lesspipe >/dev/null 2>&1 \
+type -t lesspipe >/dev/null \
        && eval `lesspipe`
 
 # Setup slrn(1) and cleanscore(1), if installed
-type cleanscore >/dev/null 2>&1 \
+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 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"
@@ -185,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-