Browse Source

fix mistakes in fabfile

master
wes 8 years ago
parent
commit
f2ba9a670c
  1. 9
      fabfile.py
  2. 1
      src/templates/search.html

9
fabfile.py

@ -17,7 +17,7 @@ def buildTags():
@task @task
def uglify(): 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 @task
def sass(): def sass():
@ -39,7 +39,10 @@ def upload():
@task @task
def serveUp(): def serveUp():
sudo("rm -fr /srv/http/build") 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 /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("cp /home/wes/tbookbuild/search.service /etc/systemd/system/search.service")
sudo("systemctl daemon-reload") sudo("systemctl daemon-reload")
sudo("systemctl enable search.service") sudo("systemctl enable search.service")
@ -71,10 +74,10 @@ def buildLocalVenv():
@task(default=True) @task(default=True)
def build(): def build():
makeBuild() makeBuild()
copy()
buildTags() buildTags()
uglify() uglify()
sass() sass()
copy()
upload() upload()
buildVenv() buildVenv()
serveUp() serveUp()
@ -82,9 +85,9 @@ def build():
@task @task
def buildLocal(): def buildLocal():
makeBuild() makeBuild()
copy()
buildTags() buildTags()
uglify() uglify()
sass() sass()
copy()
buildLocalVenv() buildLocalVenv()
serveUpLocal() serveUpLocal()

1
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/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/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="//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> <script type="text/javascript" src="/scripts/search.min.js"></script>
</body> </body>

Loading…
Cancel
Save