screenrc: Use a variable to build up hardstatus/caption.

[config/dotfiles.git] / bash / rc

diff --git a/bash/rc b/bash/rc
index 7c1a6e7914bdda727e3105bbeb90e338c9fbb124..a62272e7bfe2c15f96409a2cbb09e0a4b1278b7d 100644 (file)
--- a/bash/rc
+++ b/bash/rc
@@ -26,7 +26,7 @@ source_config ~/.shell "" env $host
 
 # Check if this is an interactive shell. Abort if not to prevent problems with
 # scp and rcp. Taken from default Debian bashrc. Thanks.
-if [[ $- != *i* ]] ; then
+if [[ $- != *i* ]]; then
     return
 fi
 
@@ -38,6 +38,11 @@ PS1='\[\033[01;32m\]\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\] \$ '
 # Use Vi(m) style in bash.
 set -o vi
 
+# Load aliases and similar functions also used by other shells.
+if [[ -f ~/.shell/aliases ]]; then
+    . ~/.shell/aliases
+fi
+
 
 # Load rc file for current hostname (first part before a dot) or rc.local.
 source_config ~/.bash host rc $host