From 05432b931bf579085f39fee36200cf1a1b810497 Mon Sep 17 00:00:00 2001 From: jobevers Date: Thu, 26 Jan 2017 19:38:52 -0600 Subject: [PATCH] fixes --- build.sh | 27 +++++++++++---------------- lbry | 2 +- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/build.sh b/build.sh index f699010cf..7b4bddc3d 100755 --- a/build.sh +++ b/build.sh @@ -23,25 +23,20 @@ if [ -n "${TEAMCITY_VERSION:-}" ]; then set +u source "$VENV/bin/activate" set -u - pip install -U pip setuptools + pip install -U pip setuptools pyinstaller fi +npm install -( - cd "$ROOT/app" - npm install -) - -( - cd "$ROOT/lbry" - pip install -r requirements.txt - # need to install our version of lbryum, not - # what is currently on master - pushd "$ROOT/lbryum" - pip install . - popd - pip install . -) +pushd "$ROOT/lbry" +pip install -r requirements.txt +# need to install our version of lbryum, not +# what is currently on master +pushd "$ROOT/lbryum" +pip install . +popd +pip install . +popd ( cd "$ROOT/lbrynet" diff --git a/lbry b/lbry index a407bb2db..716c41871 160000 --- a/lbry +++ b/lbry @@ -1 +1 @@ -Subproject commit a407bb2db21bf9460100eddd130401d33c0e538b +Subproject commit 716c4187177c923aa915d2849c92228ddb78918c