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

Read user before global configuration so its values take priority over it.

Browse source
This commit is contained in:
Christoph Niethammer 2019-09-23 14:58:31 +00:00
parent 56f627dc14
commit 00b50d0176
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sit
View file

@ -77,14 +77,14 @@ SIT_USER_CONFIG_FILE=$HOME/.sit
source "$SIT_PATH/functions.sh" source "$SIT_PATH/functions.sh"
# Reading in global configuration file
if [[ -e $SIT_CONFIG_FILE ]] ; then
source $SIT_CONFIG_FILE
fi
# Reading in user configuration file if it exists # Reading in user configuration file if it exists
if [[ -e $SIT_USER_CONFIG_FILE ]] ; then if [[ -e $SIT_USER_CONFIG_FILE ]] ; then
source $SIT_USER_CONFIG_FILE source $SIT_USER_CONFIG_FILE
fi fi
# Reading in global configuration file
if [[ -e $SIT_CONFIG_FILE ]] ; then
source $SIT_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}