From 30f6428af04d558e6911803e340934d1df1410cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sat, 9 Sep 2017 19:40:54 +0200
Subject: [PATCH] updated unified build script

---
 build.sh   |  7 +++----
 packcss.sh |  5 -----
 packjs.sh  | 15 ---------------
 3 files changed, 3 insertions(+), 24 deletions(-)
 delete mode 100755 packcss.sh
 delete mode 100755 packjs.sh

diff --git a/build.sh b/build.sh
index 45bef28..27e23e6 100755
--- a/build.sh
+++ b/build.sh
@@ -11,12 +11,11 @@ cat jssrc/chibi.js \
 	jssrc/lang.js \
 	jssrc/wifi.js \
 	jssrc/term_* \
-	jssrc/term.js > js/app-full.js
-
-yuicompressor js/app-full.js > js/app.js
+	jssrc/term.js \
+  jssrc/soft_keyboard.js | npm run --silent minify > js/app.js
 
 echo "Building CSS..."
 
-sass --style=compressed sass/app.scss css/app.css
+npm run sass -- --output-style compressed sass/app.scss > css/app.css
 
 echo "ESPTerm front-end ready"
diff --git a/packcss.sh b/packcss.sh
deleted file mode 100755
index c166465..0000000
--- a/packcss.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-echo "Building css..."
-
-npm run sass -- --output-style compressed sass/app.scss > css/app.css
diff --git a/packjs.sh b/packjs.sh
deleted file mode 100755
index 737eb63..0000000
--- a/packjs.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-echo "Packing js..."
-
-cat jssrc/chibi.js \
-	jssrc/keymaster.js \
-	jssrc/utils.js \
-	jssrc/modal.js \
-	jssrc/notif.js \
-	jssrc/appcommon.js \
-	jssrc/lang.js \
-	jssrc/wifi.js \
-	jssrc/term_* \
-	jssrc/term.js \
-  jssrc/soft_keyboard.js | npm run --silent minify > js/app.js