commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/7eb60432624a/ Changeset: 7eb60432624a User: martenson Date: 2014-11-04 18:38:24+00:00 Summary: teach reports app to find its new config file Affected #: 1 file diff -r a63423bf65cbefe8d2bcd5801808b32a509a0cd9 -r 7eb60432624a395db7ac58cee599d92abeb420b6 run_reports.sh --- a/run_reports.sh +++ b/run_reports.sh @@ -20,7 +20,17 @@ ./scripts/common_startup.sh --skip-samples -GALAXY_REPORTS_CONFIG=${GALAXY_REPORTS_CONFIG:-reports_wsgi.ini} +if [ -z "$GALAXY_REPORTS_CONFIG" ]; then + if [ -f reports_wsgi.ini ]; then + GALAXY_REPORTS_CONFIG=reports_wsgi.ini + elif [ -f config/tool_shed.ini ]; then + GALAXY_REPORTS_CONFIG=config/reports_wsgi.ini + else + GALAXY_REPORTS_CONFIG=config/reports_wsgi.ini.sample + export GALAXY_REPORTS_CONFIG + fi +fi + GALAXY_REPORTS_PID=${GALAXY_REPORTS_PID:-reports_webapp.pid} GALAXY_REPORTS_LOG=${GALAXY_REPORTS_LOG:-reports_webapp.log} https://bitbucket.org/galaxy/galaxy-central/commits/4ae407bf9857/ Changeset: 4ae407bf9857 User: martenson Date: 2014-11-04 18:58:42+00:00 Summary: typo Affected #: 1 file diff -r 7eb60432624a395db7ac58cee599d92abeb420b6 -r 4ae407bf9857967f3724731cea90314e88f63135 run_reports.sh --- a/run_reports.sh +++ b/run_reports.sh @@ -23,7 +23,7 @@ if [ -z "$GALAXY_REPORTS_CONFIG" ]; then if [ -f reports_wsgi.ini ]; then GALAXY_REPORTS_CONFIG=reports_wsgi.ini - elif [ -f config/tool_shed.ini ]; then + elif [ -f config/reports_wsgi.ini ]; then GALAXY_REPORTS_CONFIG=config/reports_wsgi.ini else GALAXY_REPORTS_CONFIG=config/reports_wsgi.ini.sample 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