From 41e244c255d6c9118f48a69ebb9405958b5a24a7 Mon Sep 17 00:00:00 2001 From: mappu Date: Sat, 28 Oct 2017 11:51:23 +1300 Subject: [PATCH] build: replace minipack shell script with sed commands --- Makefile | 7 ++++--- minipack | 22 ---------------------- 2 files changed, 4 insertions(+), 25 deletions(-) delete mode 100755 minipack diff --git a/Makefile b/Makefile index 0da23c9..1b25c0f 100644 --- a/Makefile +++ b/Makefile @@ -33,10 +33,11 @@ bindata.go: client client/* cp -r ./client ./clientpack ( echo ';(function() {' ; cat clientpack/dcwebui.js ; echo '})();' ) | uglifyjs -o clientpack/dcwebui.min.js -c -m --ie8 lessc --clean-css clientpack/dcwebui.css clientpack/dcwebui.min.css + #./minipack style dcwebui.css clientpack/dcwebui.min.css cat clientpack/index.htm \ - | ./minipack style dcwebui.css clientpack/dcwebui.min.css \ - | ./minipack script dcwebui.js clientpack/dcwebui.min.js \ - | ./minipack script socket.io-1.7.2.js clientpack/socket.io-1.7.2.js \ + | sed -e '/dcwebui.css/{i ' -e 'd}' \ + | sed -e '/dcwebui.js/{i ' -e 'd}' \ + | sed -e '/socket.io-1.7.2.js/{i ' -e 'd}' \ > clientpack/index.packed.htm mv clientpack/index.packed.htm clientpack/index.htm html-minifier --collapse-whitespace -o clientpack/index.min.htm clientpack/index.htm diff --git a/minipack b/minipack deleted file mode 100755 index 8b09afe..0000000 --- a/minipack +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -set -eu - -embed() { - local tag="$1" - local find="$2" - local sourcefile="$3" - - while IFS= read -r line ; do - if [[ "${line}" =~ "${find}" ]] ; then - echo -n "<${tag}>" - cat "${sourcefile}" - echo -n "" - else - echo "${line}" - fi - done - -} - -embed "$@"