spruce up build.sh
This commit is contained in:
parent
cafe34cbdc
commit
ebfdabedf4
1 changed files with 31 additions and 24 deletions
55
build.sh
55
build.sh
|
@ -3,34 +3,41 @@
|
||||||
set -o xtrace
|
set -o xtrace
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
cd electron
|
ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
npm install
|
|
||||||
|
|
||||||
cd ../lbry
|
(
|
||||||
git fetch
|
cd "$ROOT/electron"
|
||||||
git reset --hard origin/master
|
npm install
|
||||||
git cherry-pick bd75e88ebebb67897c62a1ee1d3228fd269677dc
|
)
|
||||||
pip install -r requirements.txt
|
|
||||||
pip install .
|
|
||||||
git reset --hard origin/master
|
|
||||||
|
|
||||||
cd ../lbrynet
|
(
|
||||||
pyinstaller lbry.py -y --windowed --onefile --icon=../lbry/packaging/osx/lbry-osx-app/app.icns
|
cd "$ROOT/lbry"
|
||||||
|
git fetch
|
||||||
|
git reset --hard origin/master
|
||||||
|
git cherry-pick bd75e88ebebb67897c62a1ee1d3228fd269677dc
|
||||||
|
pip install -r requirements.txt
|
||||||
|
pip install .
|
||||||
|
git reset --hard origin/master
|
||||||
|
)
|
||||||
|
|
||||||
cd ../lbry-web-ui
|
(
|
||||||
git fetch
|
cd "$ROOT/lbrynet"
|
||||||
git reset --hard origin/master
|
pyinstaller lbry.py -y --windowed --onefile --icon="$ROOT/lbry/packaging/osx/lbry-osx-app/app.icns"
|
||||||
# git reset --hard origin/development
|
)
|
||||||
git cherry-pick 06224b1d2cf4bf1f63d95031502260dd9c3ec5c1
|
|
||||||
npm install
|
|
||||||
node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
|
|
||||||
node_modules/.bin/webpack
|
|
||||||
git reset --hard origin/master
|
|
||||||
# git reset --hard origin/development
|
|
||||||
|
|
||||||
cd ..
|
(
|
||||||
cp -R lbry-web-ui/dist electron/
|
cd "$ROOT/lbry-web-ui"
|
||||||
|
git fetch
|
||||||
|
git reset --hard origin/master
|
||||||
|
git cherry-pick 06224b1d2cf4bf1f63d95031502260dd9c3ec5c1
|
||||||
|
npm install
|
||||||
|
node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
|
||||||
|
node_modules/.bin/webpack
|
||||||
|
git reset --hard origin/master
|
||||||
|
)
|
||||||
|
|
||||||
mv lbrynet/dist/lbry electron/dist
|
cp --recursive "$ROOT/lbry-web-ui/dist" "$ROOT/electron/"
|
||||||
|
|
||||||
|
mv "$ROOT/lbrynet/dist/lbry" "$ROOT/electron/dist"
|
||||||
|
|
||||||
echo 'Build complete. Run `electron electron` to launch the app'
|
echo 'Build complete. Run `electron electron` to launch the app'
|
||||||
|
|
Loading…
Add table
Reference in a new issue