From ad99ded33335da32148b22823db976f1ae90aa5f Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Sun, 11 Apr 2021 13:45:33 +0100
Subject: [PATCH] Try 4.

---
 ci/install.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/ci/install.sh b/ci/install.sh
index 9b14ce93..874675df 100755
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -4,6 +4,7 @@ set -x # Prints every command
 
 # This file is only used from Travis CI, where the only Linux distro used is Ubuntu
 
+pip=pip3
 if [[ "$(uname -s)" == 'Linux' ]]; then
     sudo apt  update     --yes
     sudo apt  install    --yes cmake
@@ -12,17 +13,20 @@ if [[ "$(uname -s)" == 'Linux' ]]; then
         sudo apt install --yes valgrind
     fi
     sudo apt  autoremove --yes
+    if [ -n "$WITH_VALGRIND" ]; then
+        sudo apt-get install valgrind
+    fi
+    pip=pip
 fi
 
-python3 --version
-
-sudo pip3 install virtualenv
+sudo $pip install virtualenv
 virtualenv conan
 source conan/bin/activate
-pip3 install conan==1.30.2
-pip3 install codecov
-pip3 install lxml
+$pip3 install conan==1.30.2
+$pip3 install codecov
+$pip3 install lxml
 
+python3 --version
 conan --version
 conan config set storage.path=~/conanData
 conan profile new default --detect