LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

use electron branch of web-ui

Browse source
This commit is contained in:
Job Evers-Meltzer 2017-01-19 03:51:54 -06:00
parent a14414eb2f
commit 09b9bacc35
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
build.sh
View file

@ -8,17 +8,16 @@ ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
if [ -n "${TEAMCITY_VERSION:-}" ]; then if [ -n "${TEAMCITY_VERSION:-}" ]; then
# install dependencies # install dependencies
$ROOT/prebuild.sh $ROOT/prebuild.sh
fi
VENV="$ROOT/build_venv"
VENV="$ROOT/build_venv" if [ -d "$VENV" ]; then
if [ -d "$VENV" ]; then rm -rf "$VENV"
rm -rf "$VENV" fi
virtualenv "$VENV"
set +u
source "$VENV/bin/activate"
set -u
fi fi
virtualenv "$VENV"
set +u
source "$VENV/bin/activate"
set -u
( (
@ -43,13 +42,9 @@ set -u
( (
cd "$ROOT/lbry-web-ui" cd "$ROOT/lbry-web-ui"
git fetch
git reset --hard origin/master
git cherry-pick 06224b1d2cf4bf1f63d95031502260dd9c3ec5c1
npm install npm install
node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/ node_modules/.bin/node-sass --output dist/css --sourcemap=none scss/
node_modules/.bin/webpack node_modules/.bin/webpack
git reset --hard origin/master
) )
cp -R "$ROOT/lbry-web-ui/dist" "$ROOT/electron/" cp -R "$ROOT/lbry-web-ui/dist" "$ROOT/electron/"
@ -79,4 +74,6 @@ else
echo 'Build complete. Run `electron electron` to launch the app' echo 'Build complete. Run `electron electron` to launch the app'
fi fi
deactivate if [ -n "${TEAMCITY_VERSION:-}" ]; then
deactivate
fi

2
lbry-web-ui

@ -1 +1 @@
Subproject commit 2aa10261d957a73144b86c2ecc70b71b8f7869e7 Subproject commit 8452dd8bd56653d8072b04ec592d9c944a8b9843