source_config() can load normal configuration files.

[config/dotfiles.git] / shell / env

diff --git a/shell/env b/shell/env
index 595115370245783eb67c48ae970aff3e880bcbf8..6424c5892077d3625659cd94cbc1ecc811fcea6b 100644 (file)
--- a/shell/env
+++ b/shell/env
@@ -65,6 +65,7 @@ export LSCOLORS
 #     in $1.
 # $3: Base name of file in $2, for example "rc" or "env".
 # $4: Extension for $3, if this file doesn't exist "$1/$3.local" is sourced.
+#     Can be empty, then no extension is used.
 # $5: Additional options, set to nolocal to prevent loading of "$1/$3.local"
 #                         if "$1/$2/$3.$4" doesn't exist.
 #
@@ -91,14 +92,25 @@ export LSCOLORS
 # source_config zsh os   env $os       nolocal # loads os/rc.Darwin
 # source_config zsh host env $hostname         # loads env.local
 #
+# By letting $4 empty normal configuration files can be sourced. A .local can
+# still be used.
+#
+# source_config zsh "" file # loads zsh/file if it exists
+#
 # Doesn't fit perfectly in this file, but this is the best place to make it
 # available everywhere.
 #
 # If DEBUG is set to a non empty value additional debug output is printed.
 function source_config() {
     # Path to the file to source and its local counterpart.
-    local source_file=$1/$2/$3.$4
-    local source_file_local=$1/$3.local
+    if [ x$4 != x ]; then
+        source_file=$1/$2/$3.$4
+    # If $4 is empty don't append a trailing dot. This allows source_config()
+    # to load normal configuration files.
+    else
+        source_file=$1/$2/$3
+    fi
+    source_file_local=$1/$3.local
 
     # Additional debug output.
     source_debug "source_config(): checking if $source_file exists"
@@ -107,16 +119,20 @@ function source_config() {
     # If the file does exist then source it.
     if [ -f $source_file ]; then
         source_debug "source_config(): -> sourcing $source_file"
-        source $source_file
+        . $source_file
 
     # Otherwise load the .local file if it exists and .local files are
     # allowed.
     elif [ -f $source_file_local -a x$5 != xnolocal ]; then
         source_debug "source_config(): -> sourcing $source_file_local"
-        source $source_file_local
+        . $source_file_local
     else
         source_debug "source_config(): -> neither exists"
     fi
+
+    unset source_file source_file_local
 }
 
 source_debug "finished sourcing ~/.shell/env"
+
+# vim: ft=sh