Fix create/manage db scripts to respect GALAXY_VIRTUAL_ENV.

mariabernard · Feb 29, 2016 · 865f2d4 · 865f2d4
1 parent 47c9318
commit 865f2d4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/create_db.sh b/create_db.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`

diff --git a/manage_db.sh b/manage_db.sh
@@ -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`