opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3188 from dannon/startup_output_tweaks

Browse Source 
Slight clarification of run.sh messaging when using conda.
This commit is contained in:
Martin Cech
2016-11-16 16:19:35 -05:00
committed by GitHub
parent 92105d99fa 0b395a7fb3
commit 164a0ad20c
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/common_startup.sh
+1 -3
View File
@@ -78,7 +78,7 @@ if [ $SET_VENV -eq 1 -a $CREATE_VENV -eq 1 ]; then
if [ ! -d "$GALAXY_VIRTUAL_ENV" ]
then
if [ $CONDA_ALREADY_INSTALLED -eq 1 ]; then
echo "There is no existing Galaxy virtualenv and Conda is available, so we are skipping virtualenv creation."
echo "There is no existing Galaxy virtualenv and Conda is available, so we are skipping virtualenv creation. Please be aware that this may cause missing dependencies."
SET_VENV=0
else
# If .venv does not exist, and there is no conda available, attempt to create it.
@@ -134,8 +134,6 @@ if [ $SET_VENV -eq 1 ]; then
echo "ERROR: A virtualenv cannot be found. Please create a virtualenv in $GALAXY_VIRTUAL_ENV, or activate one."
exit 1
fi
elif [ $SET_VENV -eq 0 -a $CONDA_ALREADY_INSTALLED -eq 1 ]; then
echo "Warning: You have Conda installed. Skipping virtualenv activation. This could cause missing dependencies."
fi
: ${GALAXY_WHEELS_INDEX_URL:="https://wheels.galaxyproject.org/simple"}