From f2ba9a670c8e11001eee654846e71380ecdaeb76 Mon Sep 17 00:00:00 2001
From: wes <wjak56@gmail.com>
Date: Sat, 25 Feb 2017 13:37:49 -0500
Subject: [PATCH] fix mistakes in fabfile

---
 fabfile.py                | 9 ++++++---
 src/templates/search.html | 1 -
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fabfile.py b/fabfile.py
index 1eb9781..10e0596 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -17,7 +17,7 @@ def buildTags():
 
 @task
 def uglify():
-    local("uglifyjs ./build/scripts/*js > ./build/scripts/search.min.js")
+    local("uglifyjs ./build/scripts/tags.js ./build/scripts/search.js > ./build/scripts/search.min.js")
 
 @task
 def sass():
@@ -39,7 +39,10 @@ def upload():
 @task
 def serveUp():
     sudo("rm -fr /srv/http/build")
+    sudo("rm -fr /srv/http/goal/scripts/")
+    sudo("mkdir -p /srv/http/goal/scripts")
     sudo("cp -r /home/wes/tbookbuild /srv/http/build")
+    sudo("cp -r /home/wes/tbookbuild/scripts/*js /srv/http/goal/scripts/")
     sudo("cp /home/wes/tbookbuild/search.service /etc/systemd/system/search.service")
     sudo("systemctl daemon-reload")
     sudo("systemctl enable search.service")
@@ -71,10 +74,10 @@ def buildLocalVenv():
 @task(default=True)
 def build():
     makeBuild()
+    copy()
     buildTags()
     uglify()
     sass()
-    copy()
     upload()
     buildVenv()
     serveUp()
@@ -82,9 +85,9 @@ def build():
 @task
 def buildLocal():
     makeBuild()
+    copy()
     buildTags()
     uglify()
     sass()
-    copy()
     buildLocalVenv()
     serveUpLocal()
diff --git a/src/templates/search.html b/src/templates/search.html
index 9c693a5..03d0b5f 100644
--- a/src/templates/search.html
+++ b/src/templates/search.html
@@ -34,7 +34,6 @@
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/riot/2.6.7/riot+compiler.min.js"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ramda/0.22.1/ramda.min.js"></script>
 <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/fetch/2.0.2/fetch.min.js"></script>
-<script type="text/javascript" src="/scripts/tags.min.js"></script>
 <script type="text/javascript" src="/scripts/search.min.js"></script>
 
 </body>