X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fenv;h=595115370245783eb67c48ae970aff3e880bcbf8;hb=0d1c3c96beca1d3667df0fc7985423fab82d8086;hp=be55b4e863f1b808a3b2186aa20b5722d88b2a0e;hpb=80ebbd76a0e34625489235f41aa934d69e4b11ff;p=config%2Fdotfiles.git

diff --git a/shell/env b/shell/env
index be55b4e..5951153 100644
--- 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
@@ -88,24 +101,22 @@ function source_config() {
     local 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_debug "source_config(): -> sourcing $source_file"
         source $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_debug "source_config(): -> sourcing $source_file_local"
         source $source_file_local
+    else
+        source_debug "source_config(): -> neither exists"
     fi
 }
+
+source_debug "finished sourcing ~/.shell/env"