From f85933015e3629c4b23666414c238007cd9d9151 Mon Sep 17 00:00:00 2001 From: Marco Mariani Date: Tue, 30 Dec 2014 15:21:26 +0100 Subject: [PATCH] actually raise an error if virtualenv or pip are missing --- distribute.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/distribute.sh b/distribute.sh index 41f8203bd8..95913b3743 100755 --- a/distribute.sh +++ b/distribute.sh @@ -66,8 +66,8 @@ CYTHON+=" -t" export LIBLINK_PATH="$BUILD_PATH/objects" export LIBLINK="$ROOT_PATH/src/tools/liblink" export BIGLINK="$ROOT_PATH/src/tools/biglink" -export PIP=$PIP_NAME -export VIRTUALENV=$VIRTUALENV_NAME +export PIP=${PIP_NAME:-pip} +export VIRTUALENV=${VIRTUALENV_NAME:-virtualenv} export COPYLIBS=0 @@ -737,7 +737,7 @@ function run_pymodules_install() { debug "We want to install: $PYMODULES" debug "Check if $VIRTUALENV and $PIP are present" - for tool in $VIRTUALENV $PIP; do + for tool in "$VIRTUALENV" "$PIP"; do which $tool &>/dev/null if [ $? -ne 0 ]; then error "Tool $tool is missing"