Fix create/manage db scripts to respect GALAXY_VIRTUAL_ENV.

This commit is contained in:
John Chilton
2016-02-29 13:31:42 +00:00
parent 78b1f9af37
commit dc897cf86a
2 changed files with 10 additions and 6 deletions
+5 -3
View File
@@ -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`
+5 -3
View File
@@ -5,10 +5,12 @@
# sh manage_db.sh downgrade --version=3 <tool_shed if using that webapp - galaxy is the default>
#######
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`