commit 6afe71fe0e0b0adceae56092e2ec32b80b42fc85 parent 3c28e34919dd356a5040d61bf10e5fe8075f2334 Author: Johann Bauer <bauerj@bauerj.eu> Date: Sat, 31 Mar 2018 18:12:50 +0200 Follow-up 3c28e3491 Diffstat:
| M | contrib/build-osx/make_osx | | | 6 | +++--- |
| M | contrib/build-wine/build-electrum-git.sh | | | 4 | ++-- |
| M | contrib/build-wine/prepare-wine.sh | | | 2 | +- |
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/contrib/build-osx/make_osx b/contrib/build-osx/make_osx @@ -56,12 +56,12 @@ tar xz --directory $BUILDDIR cp $BUILDDIR/libusb/1.0.22/lib/libusb-1.0.dylib contrib/build-osx info "Installing requirements..." -python3 -m pip install -Ir --require-hashes ./contrib/deterministic-build/requirements.txt --user && \ -python3 -m pip install -Ir --require-hashes ./contrib/deterministic-build/requirements-binaries.txt --user || \ +python3 -m pip install --require-hashes -Ir ./contrib/deterministic-build/requirements.txt --user && \ +python3 -m pip install --require-hashes -Ir ./contrib/deterministic-build/requirements-binaries.txt --user || \ fail "Could not install requirements" info "Installing hardware wallet requirements..." -python3 -m pip install -Ir --require-hashes ./contrib/deterministic-build/requirements-hw.txt --user || \ +python3 -m pip install --require-hashes -Ir ./contrib/deterministic-build/requirements-hw.txt --user || \ fail "Could not install hardware wallet requirements" info "Building $PACKAGE..." diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh @@ -56,9 +56,9 @@ cp -r electrum-locale/locale $WINEPREFIX/drive_c/electrum/lib/ cp electrum-icons/icons_rc.py $WINEPREFIX/drive_c/electrum/gui/qt/ # Install frozen dependencies -$PYTHON -m pip install -r --require-hashes ../../deterministic-build/requirements.txt +$PYTHON -m pip install --require-hashes -r ../../deterministic-build/requirements.txt -$PYTHON -m pip install -r --require-hashes ../../deterministic-build/requirements-hw.txt +$PYTHON -m pip install --require-hashes -r ../../deterministic-build/requirements-hw.txt pushd $WINEPREFIX/drive_c/electrum $PYTHON setup.py install diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh @@ -112,7 +112,7 @@ $PYTHON -m pip install pywin32-ctypes==0.1.2 # install PySocks $PYTHON -m pip install win_inet_pton==1.0.1 -$PYTHON -m pip install -r --require-hashes $here/../deterministic-build/requirements-binaries.txt +$PYTHON -m pip install --require-hashes -r $here/../deterministic-build/requirements-binaries.txt # Install PyInstaller $PYTHON -m pip install https://github.com/ecdsa/pyinstaller/archive/fix_2952.zip