Another fix for virtualenv fixes.

mariabernard · Mar 10, 2016 · 438661e · 438661e
1 parent 5824bc0
commit 438661e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/run_reports.sh b/run_reports.sh
@@ -11,15 +11,15 @@
 
 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
 
-./scripts/common_startup.sh --skip-samples
-
 if [ -z "$GALAXY_REPORTS_CONFIG" ]; then
     if [ -f reports_wsgi.ini ]; then
         GALAXY_REPORTS_CONFIG=reports_wsgi.ini

diff --git a/run_tool_shed.sh b/run_tool_shed.sh
@@ -2,14 +2,15 @@
 
 cd `dirname $0`
 
+./scripts/common_startup.sh
+
 : ${GALAXY_VIRTUAL_ENV:=.venv}
 
 if [ -d "$GALAXY_VIRTUAL_ENV" ];
 then
     . "$GALAXY_VIRTUAL_ENV/bin/activate"
 fi
 
-./scripts/common_startup.sh
 
 tool_shed=`./lib/tool_shed/scripts/bootstrap_tool_shed/parse_run_sh_args.sh $@`
 args=$@