bash/rc, zsh/rc: Move aliases to shell/aliases.

[config/dotfiles.git] / bash / rc

diff --git a/bash/rc b/bash/rc
index cafc77fca01c2782c334274b3e93f6e1f4988dcd..a1ac587a8f5d0815bfb43d8cb2f1578137c02c44 100644 (file)
--- a/bash/rc
+++ b/bash/rc
@@ -6,21 +6,47 @@ host=$(echo $(hostname) | sed -e 's/\..*$//')
 
 # Load environmental related settings used by all shells.
 if [ -f ~/.shell/env ]; then
-    source ~/.shell/env
+    . ~/.shell/env
+# Fallback functions as ~/.shell/env couldn't be loaded.
 else
+    function source_debug() {
+        echo $@
+    }
     function source_config() {
         echo "Couldn't load source_config(), can't source files." >&2
     }
 fi
 
+source_debug "sourcing ~/.bash/rc"
+
 # Load global env file for current hostname (first part before a dot) or
 # global env.local.
 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
+    return
+fi
+
+
+# Set the prompt; hostname and current working directory are displayed.
+# Hostname is displayed in green, current directory in blue.
+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 "" rc $host
+source_config ~/.bash host rc $host
+
+source_debug "finished sourcing ~/.bash/env"
+
+# vim: ft=sh