opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-13 16:57:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1890 from jmchilton/fix_virtualenvs

Browse Source 
[16.01] Fix virtual env handling broken with #1847.
This commit is contained in:
Nate Coraor
2016-03-15 16:52:52 -04:00
parent 9a343efe8b 438661e894
commit 00a7c3af05
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
run_reports.sh
+7
View File
@@ -13,6 +13,13 @@ cd `dirname $0`
./scripts/common_startup.sh --skip-samples
: ${GALAXY_VIRTUAL_ENV:=.venv}
if [ -d "$GALAXY_VIRTUAL_ENV" ];
then
. "$GALAXY_VIRTUAL_ENV/bin/activate"
fi
if [ -z "$GALAXY_REPORTS_CONFIG" ]; then
if [ -f reports_wsgi.ini ]; then
GALAXY_REPORTS_CONFIG=reports_wsgi.ini
run_tool_shed.sh
+8
View File
@@ -4,6 +4,14 @@ cd `dirname $0`
./scripts/common_startup.sh
: ${GALAXY_VIRTUAL_ENV:=.venv}
if [ -d "$GALAXY_VIRTUAL_ENV" ];
then
. "$GALAXY_VIRTUAL_ENV/bin/activate"
fi
tool_shed=`./lib/tool_shed/scripts/bootstrap_tool_shed/parse_run_sh_args.sh $@`
args=$@