commit/galaxy-central: natefoo: Ensure the correct default Galaxy config file is found in common_startup.sh, it
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/93d2916499f4/ Changeset: 93d2916499f4 User: natefoo Date: 2015-02-12 16:47:58+00:00 Summary: Ensure the correct default Galaxy config file is found in common_startup.sh, it makes a difference for egg fetching since some eggs are conditional based on config. Affected #: 1 file diff -r 51a3606fe3bdf21d663b35d41c886ff819fd234d -r 93d2916499f4ddc3093adc65cb5718a25841aa15 scripts/common_startup.sh --- a/scripts/common_startup.sh +++ b/scripts/common_startup.sh @@ -34,7 +34,13 @@ done fi -: ${GALAXY_CONFIG_FILE:=config/galaxy.ini.sample} +: ${GALAXY_CONFIG_FILE:=config/galaxy.ini} +if [ ! -f $GALAXY_CONFIG_FILE ]; then + GALAXY_CONFIG_FILE=universe_wsgi.ini +fi +if [ ! -f $GALAXY_CONFIG_FILE ]; then + GALAXY_CONFIG_FILE=config/galaxy.ini.sample +fi if [ $FETCH_EGGS -eq 1 ]; then python ./scripts/check_eggs.py -q -c $GALAXY_CONFIG_FILE Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply@bitbucket.org