Skip to content

Added more robust check for pip and virtualenv #201

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
tito merged 1 commit into from
Jan 28, 2014
Merged

Added more robust check for pip and virtualenv #201

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
27 changes: 26 additions & 1 deletion distribute.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,30 @@ 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
VIRTUALENV_NAME="$(which virtualenv2.7)"
fi
if [ "X$VIRTUALENV_NAME" == "X" ]; then
VIRTUALENV_NAME="$(which virtualenv2)"
fi
if [ "X$VIRTUALENV_NAME" == "X" ]; then
VIRTUALENV_NAME="$(which virtualenv)"
fi

# Paths
ROOT_PATH="$(dirname $($PYTHON -c 'from __future__ import print_function; import os,sys;print(os.path.realpath(sys.argv[1]))' $0))"
RECIPES_PATH="$ROOT_PATH/recipes"
Expand All @@ -35,7 +59,8 @@ HOSTPYTHON="$BUILD_PATH/python-install/bin/python.host"
export LIBLINK_PATH="$BUILD_PATH/objects"
export LIBLINK="$ROOT_PATH/src/tools/liblink"
export BIGLINK="$ROOT_PATH/src/tools/biglink"
export PIP="pip-2.7"
export PIP=$PIP_NAME
export VIRTUALENV=$VIRTUALENV_NAME

MD5SUM=$(which md5sum)
if [ "X$MD5SUM" == "X" ]; then
Expand Down