#
# Doesn't fit perfectly in this file, but this is the best place to make it
# available everywhere.
-function source_debug() {
+function source_debug {
if [ x$DEBUG != x ]; then
echo $@
fi
# 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.
#
# 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() {
+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"
else
source_debug "source_config(): -> neither exists"
fi
+
+ unset source_file source_file_local
}
source_debug "finished sourcing ~/.shell/env"
+
+# vim: ft=sh