diff options
| author | Kali Kaneko <kali@leap.se> | 2017-07-28 21:06:00 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2017-07-28 21:10:32 -0400 |
| commit | 00ec8aadf1bf7931ad7456644f4c13432f0dd14a (patch) | |
| tree | 096fcb3b4ebf84adeba00bb168b085c6c5065644 | |
| parent | d163ebf78a0dbbb6a27364514f5ec5924119846d (diff) | |
[pkg] do not create venv if it exists already
| -rwxr-xr-x | pkg/build_bundle_with_venv.sh | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/pkg/build_bundle_with_venv.sh b/pkg/build_bundle_with_venv.sh index d76c5b53..706f17e5 100755 --- a/pkg/build_bundle_with_venv.sh +++ b/pkg/build_bundle_with_venv.sh @@ -7,13 +7,19 @@ # Stop bundling in case of errors set -e -echo "BUILDING BITMASK BUNDLE..." -git describe +VENV=venv + +echo "[+] BUILDING BITMASK BUNDLE..." +echo "[+] GIT VERSION" `git describe` + +if [ ! -d "$VENV" ]; then + echo "[+] creating virtualenv in venv" + virtualenv $VENV +fi +source "$VENV"/bin/activate +echo "[+] Using venv in" $VIRTUAL_ENV -virtualenv venv -source venv/bin/activate $VIRTUAL_ENV/bin/pip install appdirs packaging -# $VIRTUAL_ENV/bin/pip install -U pyinstaller==3.1 $VIRTUAL_ENV/bin/pip install -U pyinstaller $VIRTUAL_ENV/bin/pip install zope.interface zope.proxy @@ -21,12 +27,11 @@ $VIRTUAL_ENV/bin/pip install zope.interface zope.proxy $VIRTUAL_ENV/bin/pip --no-cache-dir install pysqlcipher --install-option="--bundled" # FIXME pixelated needs some things but doesn't declare it $VIRTUAL_ENV/bin/pip install chardet -# FIXME persuade pixelated to stop using requests in favor of treq +# FIXME remove requests in pixelated fork, use treq instead $VIRTUAL_ENV/bin/pip install requests==2.11.1 -# For the Bitmask 0.10 bundles. +# Soledad version: for the Bitmask 0.10 bundles, let's pick published soledad. $VIRTUAL_ENV/bin/pip install -U leap.soledad - # CHANGE THIS IF YOU WANT A DIFFERENT BRANCH CHECKED OUT FOR COMMON/SOLEDAD -------------------- #$VIRTUAL_ENV/bin/pip install -U leap.soledad --find-links https://devpi.net/kali/dev # ---------------------------------------------------------------------------------------------- @@ -40,9 +45,10 @@ make dev-mail $VIRTUAL_ENV/bin/pip uninstall --yes leap.bitmask $VIRTUAL_ENV/bin/python setup.py sdist bdist_wheel --universal -$VIRTUAL_ENV/bin/pip install dist/*.whl -pip install leap.pixelated-www leap.pixelated +echo "[+] Installing Bitmask from latest wheel..." +$VIRTUAL_ENV/bin/pip install `ls -ltr dist/*.whl | tail -n 1 | cut -d' ' -f 9` + # Get the bundled libzmq $VIRTUAL_ENV/bin/pip uninstall --yes pyzmq |