From cda5730057770471baf89473d8d4b41a5ef1b8f4 Mon Sep 17 00:00:00 2001
From: Job Evers-Meltzer <jobevers@users.noreply.github.com>
Date: Mon, 16 Jan 2017 14:36:31 -0500
Subject: [PATCH] use lbry-web-ui submodule

---
 .gitmodules |  3 +++
 README.md   | 11 +----------
 build.sh    |  7 ++++---
 lbry-web-ui |  1 +
 4 files changed, 9 insertions(+), 13 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 lbry-web-ui

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..3a5ac71cf
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "lbry-web-ui"]
+	path = lbry-web-ui
+	url = https://github.com/lbryio/lbry-web-ui.git
diff --git a/README.md b/README.md
index f0ca52556..eaba37158 100644
--- a/README.md
+++ b/README.md
@@ -4,16 +4,7 @@ An electron version of the LBRY application.
 
 ## Setup
 
-Need to have the lbry-web-ui and lbry repos in a folder next to
-lbry-electron.  For example, my directory structure looks like
-
-```
-$HOME/projects/lbryio/lbry
-$HOME/projects/lbryio/lbry-web-ui
-$HOME/projects/lbryio/lbry-electron
-```
-
-Additionally, lbrynet needs to be installed along with pyinstaller, and you
+The lbrynet needs to be installed along with pyinstaller, and you
 need everything to be able to build the lbry-web-ui
 
 ## Build
diff --git a/build.sh b/build.sh
index 3e0bb6a2c..a3433b79e 100755
--- a/build.sh
+++ b/build.sh
@@ -9,10 +9,11 @@ npm install
 cd ../lbrynet
 pyinstaller lbry.py -y --windowed --onefile --icon=../../lbry/packaging/osx/lbry-osx-app/app.icns
 
-cd ../../lbry-web-ui
-git checkout master
-git pull --rebase
+cd ../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/
 webpack
 git reset --hard origin/master
diff --git a/lbry-web-ui b/lbry-web-ui
new file mode 160000
index 000000000..3a8cc9e2e
--- /dev/null
+++ b/lbry-web-ui
@@ -0,0 +1 @@
+Subproject commit 3a8cc9e2e2e6cf81cb957689837f4f150152941e