From 8742614e5243c61ee15823c0cf8aa512e9bb026f Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 28 Mar 2018 12:13:23 -0400 Subject: [PATCH] Quieter grepping. --- scripts/common_startup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/common_startup.sh b/scripts/common_startup.sh index 44d9a63c509c..009f0e5383a7 100755 --- a/scripts/common_startup.sh +++ b/scripts/common_startup.sh @@ -187,7 +187,7 @@ if [ $FETCH_WHEELS -eq 1 ]; then pip install $requirement_args --index-url "${GALAXY_WHEELS_INDEX_URL}" --extra-index-url "${PYPI_INDEX_URL}" GALAXY_CONDITIONAL_DEPENDENCIES=$(PYTHONPATH=lib python -c "from __future__ import print_function; import galaxy.dependencies; print('\n'.join(galaxy.dependencies.optional('$GALAXY_CONFIG_FILE')))") if [ -n "$GALAXY_CONDITIONAL_DEPENDENCIES" ]; then - if pip list --format=columns | grep "psycopg2[\(\ ]*2.7.3"; then + if pip list --format=columns | grep -q "psycopg2[\(\ ]*2.7.3"; then echo "An older version of psycopg2 (non-binary, version 2.7.3) has been detected. Galaxy now uses psycopg2-binary, which will be installed after removing psycopg2." pip uninstall -y psycopg2==2.7.3 fi