X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=blobdiff_plain;f=bash%2Frc;h=cafc77fca01c2782c334274b3e93f6e1f4988dcd;hp=eb672889360374c13d7e2f8009690dd26dd84d9a;hb=0f76f93bd286c46d281a574a6db67e038b6d42a7;hpb=dbd35008dac79b1213e70d48e11b19920a2a54f7

diff --git a/bash/rc b/bash/rc
index eb67288..cafc77f 100644
--- a/bash/rc
+++ b/bash/rc
@@ -5,27 +5,22 @@
 host=$(echo $(hostname) | sed -e 's/\..*$//')
 
 # Load environmental related settings used by all shells.
-# If the default file exists, load it.
 if [ -f ~/.shell/env ]; then
     source ~/.shell/env
+else
+    function source_config() {
+        echo "Couldn't load source_config(), can't source files." >&2
+    }
 fi
-# If an env file for the current hostname (first part before a dot) exists load
-# it, otherwise load env.local if available.
-if [ -f ~/.shell/env.$host ]; then
-    source ~/.shell/env.$host
-elif [ -f ~/.shell/env.local ]; then
-    source ~/.shell/env.local
-fi
+
+# Load global env file for current hostname (first part before a dot) or
+# global env.local.
+source_config ~/.shell "" env $host
 
 
 # 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.
-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