diff --git a/contrib/install-pysolfc.sh b/contrib/install-pysolfc.sh index f483b279..245269e4 100755 --- a/contrib/install-pysolfc.sh +++ b/contrib/install-pysolfc.sh @@ -2,15 +2,15 @@ set -Cefu : ${PKGTREE:=/usr/local/packages/PySolFC} -PIP=("${PKGTREE}/env/bin/pip" install --no-binary :all:) -PYPROG="$(printf '%s/env/bin/python' "$PKGTREE")" +PIP="${PKGTREE}/env/bin/pip" +PYPROG="${PKGTREE}/env/bin/python" VERSION="$(env PYTHONPATH=`pwd` "$PYPROG" -c 'from pysollib.settings import VERSION ; print(VERSION)')" -XZBALL="$(printf 'dist/PySolFC-%s.tar.xz' "$VERSION")" -reqs='six random2 pillow' +XZBALL="dist/PySolFC-${VERSION}.tar.xz" +reqs=(pillow pygame random2 six) make dist -for req in $reqs -do - "${PIP[@]}" "$req" -done -"${PIP[@]}" --upgrade "$XZBALL" + +"$PIP" install wheel +"$PIP" install "${reqs[@]}" + +"$PIP" install --upgrade "$XZBALL"