Simplified loading of config files by using a function.

[config/dotfiles.git] / bash / rc

diff --git a/bash/rc b/bash/rc
index 3874363eea7dacec14f3a0b5cfe030f6ca62b549..cafc77fca01c2782c334274b3e93f6e1f4988dcd 100644 (file)
--- a/bash/rc
+++ b/bash/rc
@@ -1,20 +1,26 @@
 # Main bash configuration file.
 
 
-# Use UTF-8 encoding in the terminal.
-export LC_ALL=en_US.UTF-8
+# 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
+    source ~/.shell/env
+else
+    function source_config() {
+        echo "Couldn't load source_config(), can't source files." >&2
+    }
+fi
+
+# Load global env file for current hostname (first part before a dot) or
+# global env.local.
+source_config ~/.shell "" env $host
+
 
-# Use Vim as editor.
-export EDITOR='vim'
 # Use Vi(m) style in bash.
 set -o vi
 
 
-# If a rc file for the current hostname (first part before a dot) exists load
-# it, otherwise load rc.local if available.
-host=$(echo $(hostname) | sed -e 's/\..*$//')
-if [ -f ~/.bash/rc.$host ]; then
-    source ~/.bash/rc.$host
-elif [ -f ~/.bash/rc.local ]; then
-    source ~/.bash/rc.local
-fi
+# Load rc file for current hostname (first part before a dot) or rc.local.
+source_config ~/.bash "" rc $host