X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fenv;h=af46c8b8add8e2ec7a2f97557cc48d63784e2e9d;hb=ae1e97b372502603183cb4c4b6cac43966b10e27;hp=c654613b77a9c838b5284aa159cdecd3991a3fdf;hpb=c3ccdced26ff5d9baf36858968701e7b12447cd6;p=config%2Fdotfiles.git diff --git a/shell/env b/shell/env index c654613..af46c8b 100644 --- a/shell/env +++ b/shell/env @@ -97,8 +97,8 @@ 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. source_debug "source_config(): checking if $source_file exists" @@ -106,17 +106,19 @@ 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_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 - source_debug "source_config(): sourcing $source_file_local" - source $source_file_local + source_debug "source_config(): -> sourcing $source_file_local" + . $source_file_local else - source_debug "source_config(): neither exists" + source_debug "source_config(): -> neither exists" fi + + unset source_file source_file_local } source_debug "finished sourcing ~/.shell/env"