From 314239842e30946b7a91f7e13da42703b81bc9a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sun, 23 Jul 2017 18:28:21 +0200
Subject: [PATCH] =?UTF-8?q?fixed=20buikld=5F:web=1B[=1B[C=1B[C=1B[C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build_web.sh          | 28 +++++++++-------------------
 html_orig/css/app.css |  2 --
 2 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/build_web.sh b/build_web.sh
index 1495c74..615df48 100755
--- a/build_web.sh
+++ b/build_web.sh
@@ -7,24 +7,14 @@ mkdir -p html/img
 mkdir -p html/js
 mkdir -p html/css
 
-# Join scripts
-DD=html_orig/jssrc
-cat $DD/chibi.js \
-	$DD/utils.js \
-	$DD/modal.js \
-	$DD/appcommon.js \
-	$DD/term.js \
-	$DD/wifi.js > html/js/app.js
+cd html_orig
+sh ./packjs.sh
+php ./build_html.php
+cd ..
 
-sass --sourcemap=none html_orig/sass/app.scss html_orig/css/app.css
+cp html_orig/js/app.js html/js/
+
+sass --sourcemap=none html_orig/sass/app.scss html/css/app.css
+
+cp html_orig/img/* html/img/
 
-# No need to compress CSS and JS now, we run YUI on it later
-cp html_orig/css/app.css    html/css/app.css
-cp html_orig/term.html      html/term.tpl
-cp html_orig/wifi.html      html/wifi.tpl
-cp html_orig/about.html     html/about.tpl
-cp html_orig/help.html      html/help.tpl
-cp html_orig/wifi_conn.html html/wifi_conn.tpl
-cp html_orig/img/loader.gif html/img/loader.gif
-cp html_orig/img/cvut.svg    html/img/cvut.svg
-cp html_orig/favicon.ico    html/favicon.ico
diff --git a/html_orig/css/app.css b/html_orig/css/app.css
index 5baf098..6a5f482 100644
--- a/html_orig/css/app.css
+++ b/html_orig/css/app.css
@@ -1280,5 +1280,3 @@ body.term #botnav {
 @media screen and (max-width: 1000px) {
   .mq-normal-min {
     display: none !important; } }
-
-/*# sourceMappingURL=app.css.map */