Simplified loading of config files by using a function.

[config/dotfiles.git] / zsh / env

diff --git a/zsh/env b/zsh/env
index a3cb729747263e3380c6dc0fce4deac6ed8da7da..a3725b3a7d6a100995b0bdde69639dae3dcc81b8 100644 (file)
--- a/zsh/env
+++ b/zsh/env
@@ -5,23 +5,17 @@
 host=${$(hostname)//.*/}
 
 # Load environmental related settings used by all shells.
-# If the default file exists, load it.
 if [[ -f ~/.shell/env ]]; then
     source ~/.shell/env
-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
+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
 
-# If an env file for the current hostname (first part before a dot) exists load
-# it, otherwise load env.local if available.
-if [[ -f ~/.zsh/env.$host ]]; then;
-    source ~/.zsh/env.$host
-elif [[ -f ~/.zsh/env.local ]]; then;
-    source ~/.zsh/env.local
-fi
+# Load env file for current hostname (first part before a dot) or env.local.
+source_config ~/.zsh "" env $host