hpcchris/sit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix order in which config files are read: First global, the user.

Browse source
This commit is contained in:
Christoph Niethammer 2016-05-03 06:52:24 +00:00
parent 8ca07c229e
commit e4e02bbd21
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sit
View file

@ -63,15 +63,17 @@ while [ "$1" != "" ] ; do
shift shift
done done
# Reading in user configuration file if it exists
if [[ -e $SIT_USER_CONFIG_FILE ]] ; then source "$SIT_PATH/functions.sh"
source $SIT_USER_CONFIG_FILE
fi
# Reading in global configuration file # Reading in global configuration file
if [[ -e $SIT_CONFIG_FILE ]] ; then if [[ -e $SIT_CONFIG_FILE ]] ; then
source $SIT_CONFIG_FILE source $SIT_CONFIG_FILE
fi 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 # identify platform manually if no environment variable was set
PLATFORM=${PLATFORM:=$SITE_PLATFORM_NAME} PLATFORM=${PLATFORM:=$SITE_PLATFORM_NAME}