Skip to content

Don't search for the pip command #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 4, 2015
Merged

Don't search for the pip command #316

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 7 additions & 22 deletions distribute.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,6 @@ if [ "X$PYTHON" == "X" ]; then
PYTHON="$(which python)"
fi

# Resolve pip path
PIP_NAME="$(which pip-2.7)"
if [ "X$PIP_NAME" == "X" ]; then
PIP_NAME="$(which pip2.7)"
fi
if [ "X$PIP_NAME" == "X" ]; then
PIP_NAME="$(which pip2)"
fi
if [ "X$PIP_NAME" == "X" ]; then
PIP_NAME="$(which pip)"
fi

# Resolve virtualenv path
VIRTUALENV_NAME="$(which virtualenv-2.7)"
if [ "X$VIRTUALENV_NAME" == "X" ]; then
Expand Down Expand Up @@ -66,7 +54,6 @@ 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:-pip}
export VIRTUALENV=${VIRTUALENV_NAME:-virtualenv}

export COPYLIBS=0
Expand Down Expand Up @@ -736,16 +723,14 @@ function run_pymodules_install() {

debug "We want to install: $PYMODULES"

debug "Check if $VIRTUALENV and $PIP are present"
for tool in "$VIRTUALENV" "$PIP"; do
which $tool &>/dev/null
if [ $? -ne 0 ]; then
error "Tool $tool is missing"
exit -1
fi
done
debug "Check if $VIRTUALENV is present"
which $VIRTUALENV &>/dev/null
if [ $? -ne 0 ]; then
error "Tool $VIRTUALENV is missing"
exit -1
fi

debug "Check if virtualenv is existing"
debug "Check if a virtual environment already exists"
if [ ! -d venv ]; then
debug "Installing virtualenv"
try $VIRTUALENV --python=python2.7 venv
Expand Down