From 616c225661687b05ab82160f5b7d6dcb4d39b8e6 Mon Sep 17 00:00:00 2001 From: sijanec Date: Wed, 23 Sep 2020 18:37:16 +0200 Subject: fixed meals layout - fullcalendar -- do not merge! todo: fix sidenav in meals --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 611336b..90fe3e1 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ default: @echo " make prepare installs dependencies, uses \`sudo apt\`." @echo " make generate installs BežiApp to dist/" @echo "notes and hacks:" - @echo " \`cp /bin/cp bin/bvr-jsmin\` if you don't want jsmin (before generate)" + @echo " \`env jsminpath=/bin/cp make generate\` to prevent js minification" @echo "no target specified, exiting ..." prepare: @@ -29,6 +29,6 @@ generate: mkdir -p dist/js # js ne znam te magije -find assets/js/ -name "*.bvr" -printf "%f\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/js/\$${FILE/.bvr/}"; ./bin/bvr-compose-single \"assets/js/\$$FILE\" \"\$$FILE_DST\"" - -find assets/js/ -name "*.js" -printf "%P\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/js/\$${FILE/.bvr/}"; ./bin/bvr-jsmin assets/js/\"\$$FILE\" \"\$$FILE_DST\"" + -find assets/js/ -name "*.js" -printf "%P\n" | xargs -I % bash -c "test -z "\$${jsminpath}" && jsminpath=./bin/bvr-jsmin; FILE='%'; FILE_DST="dist/js/\$${FILE/.bvr/}"; \$$jsminpath assets/js/\"\$$FILE\" \"\$$FILE_DST\"" cp -r assets/root/.well-known dist/ chmod 0775 dist -R -- cgit v1.2.3