From 456208856dbe336e9ec8285cc37a3b602bdef39b Mon Sep 17 00:00:00 2001 From: Victor LABORIE Date: Wed, 5 Sep 2018 15:24:19 +0200 Subject: [PATCH] Fix check for install venv and ansible pip --- scripts/ansible_install_pip | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/ansible_install_pip b/scripts/ansible_install_pip index 2ad722a..a586437 100755 --- a/scripts/ansible_install_pip +++ b/scripts/ansible_install_pip @@ -6,7 +6,8 @@ ANSIBLE_VERSION="${ANSIBLE_VERSION:-stable-2.2}" DEBIAN_FRONTEND=noninteractive apt-get -yq install build-essential python-dev python-virtualenv git -if [ ! -d venv ]; then - virtualenv /tmp/venv - . /tmp/venv/bin/activate && pip install "git+https://github.com/ansible/ansible.git@${ANSIBLE_VERSION}"; deactivate -fi +[ ! -f "/tmp/venv/bin/activate" ] && virtualenv /tmp/venv + +[ ! -x "/tmp/venv/bin/ansible" ] && . /tmp/venv/bin/activate && pip install "git+https://github.com/ansible/ansible.git@${ANSIBLE_VERSION}" + +exit 0