From 113f8ff2d7300bb747110280cedd8eef84181829 Mon Sep 17 00:00:00 2001 From: Alex Grintsvayg Date: Wed, 3 May 2017 13:00:01 -0400 Subject: [PATCH] fix set_build and version --- build/build.sh | 8 +++----- lbrynet/core/system_info.py | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/build/build.sh b/build/build.sh index 2f7b19660..99df33e67 100755 --- a/build/build.sh +++ b/build/build.sh @@ -27,8 +27,10 @@ if [ "$FULL_BUILD" == "true" ]; then set +u source "$VENV/bin/activate" set -u -fi + # must set build before installing lbrynet. otherwise it has no effect + python "$BUILD_DIR/set_build.py" +fi cp "$ROOT/requirements.txt" "$BUILD_DIR/requirements_base.txt" ( @@ -36,10 +38,6 @@ cp "$ROOT/requirements.txt" "$BUILD_DIR/requirements_base.txt" pip install -r requirements.txt ) -if [ "$FULL_BUILD" == "true" ]; then - python "$BUILD_DIR/set_build.py" -fi - ( cd "$BUILD_DIR" pyinstaller -y daemon.onefile.spec diff --git a/lbrynet/core/system_info.py b/lbrynet/core/system_info.py index 05300c910..cae4c231a 100644 --- a/lbrynet/core/system_info.py +++ b/lbrynet/core/system_info.py @@ -19,7 +19,7 @@ def get_lbrynet_version(): return subprocess.check_output( ['git', '--git-dir='+git_dir, 'describe', '--dirty', '--always'], stderr=devnull - ).strip() + ).strip().lstrip('v') except (subprocess.CalledProcessError, OSError): print "failed to get version from git" return lbrynet_version