From 9158cb2d31c7282fc13bc18637aa36a159ff2b73 Mon Sep 17 00:00:00 2001 From: Guillaume Thouvenin Date: Wed, 11 May 2016 17:29:37 +0200 Subject: [PATCH] Fix the check about the installation of virtualenv This patch replaces the and by an or and also fix an error in the declaration of the variable. Change-Id: I2b05e27a5c1b286973facea768373bb92c993536 --- utils/fuel-qa-builder/prepare_env.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/fuel-qa-builder/prepare_env.sh b/utils/fuel-qa-builder/prepare_env.sh index e43041f..c4fef67 100755 --- a/utils/fuel-qa-builder/prepare_env.sh +++ b/utils/fuel-qa-builder/prepare_env.sh @@ -4,9 +4,9 @@ BASE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" pip install -U pip || true -VIRTUALENV_EXIST=`dpkg -l | grep python-virtualenv && pip list | grep virtualenv` +VIRTUALENV_EXIST=`dpkg -l | grep python-virtualenv || pip list | grep virtualenv` -if [[ -z "VIRTUALENV_EXIST" ]]; then +if [[ -z "${VIRTUALENV_EXIST}" ]]; then echo 'There is no virtualnev' pip install virtualenv || apt-get install python-virtualenv || true fi @@ -29,4 +29,4 @@ cp "${BASE_DIR}"/MANIFEST.in ./ && cp "${BASE_DIR}"/setup.py ./ python setup.py sdist && pip install dist/fuelweb_test*.tar.gz && pip install -r "${BASE_DIR}"/../../requirements.txt -cd "${BASE_DIR}" && rm -rf tmp \ No newline at end of file +cd "${BASE_DIR}" && rm -rf tmp