Simplify configuration setup.

[config/dotfiles.git] / bash / rc

diff --git a/bash/rc b/bash/rc
index 7243ceb963138fbb99f7f923e0540a94f11f55dc..3cc4827fbc9a1481d136319a2c586c2fded2fa1f 100644 (file)
--- a/bash/rc
+++ b/bash/rc
@@ -3,27 +3,11 @@
 # Is sourced by all interactive shells and other shells like scp or rcp.
 
 
-# Get the current hostname (first part before a dot).
-host=$(echo $(hostname) | sed -e 's/\..*$//')
-
-# Load environmental related settings used by all shells.
-if [[ -f ~/.shell/env ]]; then
-    . ~/.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
+. ~/.shell/functions
 
 source_debug ". ~/.bash/rc"
 
-# Load global env file for current hostname (first part before a dot) or
-# global env.local.
-source_config ~/.shell "" env $host
+source_config ~/.shell/env
 
 
 # Check if this is an interactive shell. Abort if not to prevent problems with
@@ -40,14 +24,10 @@ 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
 
+source_config ~/.shell/aliases
 
-# Load rc file for current hostname (first part before a dot) or rc.local.
-source_config ~/.bash host rc $host
+source_config ~/.bash/rc.local
 
 source_debug ". ~/.bash/rc (done)"