mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-28 02:58:18 +08:00
Another fix for virtualenv fixes.
This commit is contained in:
+2
-2
@@ -11,6 +11,8 @@
|
||||
|
||||
cd `dirname $0`
|
||||
|
||||
./scripts/common_startup.sh --skip-samples
|
||||
|
||||
: ${GALAXY_VIRTUAL_ENV:=.venv}
|
||||
|
||||
if [ -d "$GALAXY_VIRTUAL_ENV" ];
|
||||
@@ -18,8 +20,6 @@ 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
|
||||
|
||||
+2
-1
@@ -2,6 +2,8 @@
|
||||
|
||||
cd `dirname $0`
|
||||
|
||||
./scripts/common_startup.sh
|
||||
|
||||
: ${GALAXY_VIRTUAL_ENV:=.venv}
|
||||
|
||||
if [ -d "$GALAXY_VIRTUAL_ENV" ];
|
||||
@@ -9,7 +11,6 @@ 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=$@
|
||||
|
||||
Reference in New Issue
Block a user