From e4e02bbd21910aa299e4ef4f6d8f315641cd4c74 Mon Sep 17 00:00:00 2001 From: Christoph Niethammer Date: Tue, 3 May 2016 06:52:24 +0000 Subject: [PATCH] Fix order in which config files are read: First global, the user. --- sit | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sit b/sit index 85fd0cd..33b26e0 100755 --- a/sit +++ b/sit @@ -63,15 +63,17 @@ while [ "$1" != "" ] ; do shift done -# Reading in user configuration file if it exists -if [[ -e $SIT_USER_CONFIG_FILE ]] ; then - source $SIT_USER_CONFIG_FILE -fi + +source "$SIT_PATH/functions.sh" + # Reading in global configuration file if [[ -e $SIT_CONFIG_FILE ]] ; then source $SIT_CONFIG_FILE fi -source "$SIT_PATH/functions.sh" +# Reading in user configuration file if it exists +if [[ -e $SIT_USER_CONFIG_FILE ]] ; then + source $SIT_USER_CONFIG_FILE +fi # identify platform manually if no environment variable was set PLATFORM=${PLATFORM:=$SITE_PLATFORM_NAME}