10000 Merge pull request #314 from mmariani/check-virtualenv-pip · bigsharp/python-for-android@6c27ac9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6c27ac9

Browse files
titotito
committed
Merge pull request kivy#314 from mmariani/check-virtualenv-pip
actually raise an error if virtualenv or pip are missing
2 parents 499dc48 + f859330 commit 6c27ac9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

‎distribute.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ CYTHON+=" -t"
6666
export LIBLINK_PATH="$BUILD_PATH/objects"
6767
export LIBLINK="$ROOT_PATH/src/tools/liblink"
6868
export BIGLINK="$ROOT_PATH/src/tools/biglink"
69-
export PIP=$PIP_NAME
70-
export VIRTUALENV=$VIRTUALENV_NAME
69+
export PIP=${PIP_NAME:-pip}
70+
export VIRTUALENV=${VIRTUALENV_NAME:-virtualenv}
7171

7272
export COPYLIBS=0
7373

@@ -737,7 +737,7 @@ function run_pymodules_install() {
737737
debug "We want to install: $PYMODULES"
738738

739739
debug "Check if $VIRTUALENV and $PIP are present"
740-
for tool in $VIRTUALENV $PIP; do
740+
for tool in "$VIRTUALENV" "$PIP"; do
741741
which $tool &>/dev/null
742742
if [ $? -ne 0 ]; then
743743
error "Tool $tool is missing"

0 commit comments

Comments
 (0)
0