Don't use local in source_config().

[config/dotfiles.git] / shell / env

diff --git a/shell/env b/shell/env
index be55b4e863f1b808a3b2186aa20b5722d88b2a0e..af46c8b8add8e2ec7a2f97557cc48d63784e2e9d 100644 (file)
--- a/shell/env
+++ b/shell/env
@@ -1,6 +1,19 @@
 # Configuration file for environment related options for all shells.
 
 
+# Helper function to print debug information if $DEBUG is not empty.
+#
+# Doesn't fit perfectly in this file, but this is the best place to make it
+# available everywhere.
+function source_debug() {
+    if [ x$DEBUG != x ]; then
+        echo $@
+    fi
+}
+
+
+source_debug "sourcing ~/.shell/env"
+
 # Use UTF-8 encoding in the terminal.
 LC_ALL=en_US.UTF-8
 LANG=$LC_ALL
@@ -84,28 +97,28 @@ export LSCOLORS
 # 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
+    source_file=$1/$2/$3.$4
+    source_file_local=$1/$3.local
 
     # Additional debug output.
-    if [ x$DEBUG != x ]; then
-        echo "source_config(): checking if $source_file exists"
-        echo "source_config(): checking if $source_file_local exists"
-    fi
+    source_debug "source_config(): checking if $source_file exists"
+    source_debug "source_config(): checking if $source_file_local exists"
 
     # If the file does exist then source it.
     if [ -f $source_file ]; then
-        if [ x$DEBUG != x ]; then
-            echo "source_config(): sourcing $source_file"
-        fi
-        source $source_file
+        source_debug "source_config(): -> sourcing $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
-        if [ x$DEBUG != x ]; then
-            echo "source_config(): sourcing $source_file_local"
-        fi
-        source $source_file_local
+        source_debug "source_config(): -> sourcing $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"