forked from LBRYCommunity/lbry-sdk
fix set_build and version
This commit is contained in:
parent
6097ebb7b8
commit
113f8ff2d7
2 changed files with 4 additions and 6 deletions
|
@ -27,8 +27,10 @@ if [ "$FULL_BUILD" == "true" ]; then
|
||||||
set +u
|
set +u
|
||||||
source "$VENV/bin/activate"
|
source "$VENV/bin/activate"
|
||||||
set -u
|
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"
|
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
|
pip install -r requirements.txt
|
||||||
)
|
)
|
||||||
|
|
||||||
if [ "$FULL_BUILD" == "true" ]; then
|
|
||||||
python "$BUILD_DIR/set_build.py"
|
|
||||||
fi
|
|
||||||
|
|
||||||
(
|
(
|
||||||
cd "$BUILD_DIR"
|
cd "$BUILD_DIR"
|
||||||
pyinstaller -y daemon.onefile.spec
|
pyinstaller -y daemon.onefile.spec
|
||||||
|
|
|
@ -19,7 +19,7 @@ def get_lbrynet_version():
|
||||||
return subprocess.check_output(
|
return subprocess.check_output(
|
||||||
['git', '--git-dir='+git_dir, 'describe', '--dirty', '--always'],
|
['git', '--git-dir='+git_dir, 'describe', '--dirty', '--always'],
|
||||||
stderr=devnull
|
stderr=devnull
|
||||||
).strip()
|
).strip().lstrip('v')
|
||||||
except (subprocess.CalledProcessError, OSError):
|
except (subprocess.CalledProcessError, OSError):
|
||||||
print "failed to get version from git"
|
print "failed to get version from git"
|
||||||
return lbrynet_version
|
return lbrynet_version
|
||||||
|
|
Loading…
Add table
Reference in a new issue