Skip to content

Commit

Permalink
Update more scripts to respect GALAXY_VIRTUAL_ENV.
Browse files Browse the repository at this point in the history
Drop explicit sourcing in run_reports and run_tool_shed since they source common_startup.
  • Loading branch information
jmchilton committed Mar 3, 2016
1 parent de70306 commit 26d5561
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 22 deletions.
8 changes: 5 additions & 3 deletions manage_tools.sh
@@ -1,9 +1,11 @@
#!/bin/sh

if [ -d .venv ];
: ${GALAXY_VIRTUAL_ENV:=.venv}

if [ -d "$GALAXY_VIRTUAL_ENV" ];
then
printf "Activating virtualenv at %s/.venv\n" $(pwd)
. .venv/bin/activate
printf "Activating virtualenv at $GALAXY_VIRTUAL_ENV\n"
. "$GALAXY_VIRTUAL_ENV/bin/activate"
fi

cd `dirname $0`
Expand Down
13 changes: 0 additions & 13 deletions run_reports.sh
Expand Up @@ -11,21 +11,8 @@

cd `dirname $0`

# If there is a .venv/ directory, assume it contains a virtualenv that we
# should run this instance in.
if [ -d .venv ];
then
. .venv/bin/activate
fi

./scripts/common_startup.sh --skip-samples

if [ -d .venv ];
then
printf "Activating virtualenv at %s/.venv\n" $(pwd)
. .venv/bin/activate
fi

if [ -z "$GALAXY_REPORTS_CONFIG" ]; then
if [ -f reports_wsgi.ini ]; then
GALAXY_REPORTS_CONFIG=reports_wsgi.ini
Expand Down
6 changes: 0 additions & 6 deletions run_tool_shed.sh
Expand Up @@ -4,12 +4,6 @@ cd `dirname $0`

./scripts/common_startup.sh

if [ -d .venv ];
then
printf "Activating virtualenv at %s/.venv\n" $(pwd)
. .venv/bin/activate
fi

tool_shed=`./lib/tool_shed/scripts/bootstrap_tool_shed/parse_run_sh_args.sh $@`
args=$@

Expand Down

0 comments on commit 26d5561

Please sign in to comment.