From 855d322a78e4575e34500ba0b093f716b8631c30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anton=20Luka=20=C5=A0ijanec?= <sijanecantonluka@gmail.com>
Date: Tue, 9 Jun 2020 18:34:50 +0200
Subject: makefile is NOT WORKING!

---
 Makefile | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 63d9cc0..1a32f02 100644
--- a/Makefile
+++ b/Makefile
@@ -9,31 +9,24 @@ prepare:
 	#!/bin/bash
 	sudo apt install git -y
 	mkdir -p tmp
-	cd tmp
-	rm -rf bverbose
-	git clone https://github.com/sijanec/bverbose
-	cd bverbose
-	make prepare
-	make install
-	mv bin/* ../../bin/
-	cd ..
-	rm -rf bverbose
-	cd ..
+	rm -rf tmp/bverbose
+	cd tmp && git clone https://github.com/sijanec/bverbose && cd bverbose && \
+	make prepare &&	make install
+	mv tmp/bverbose/bin/* bin/
+	rm -rf tmp/bverbose
 
-install:
+generate:
 	#!/bin/bash
 	./bin/bvr-compose-html assets/pages-src/ dist/pages/ .html
 	cp -r assets/css dist/
 	cp -r assets/fonts dist/
 	cp -r assets/img dist/
 	find assets/root/ -type f \( ! -name "*.bvr" \) -exec cp -r "{}" dist/  \;
-	find assets/root/ -name "*.bvr" -printf "%f\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/\${FILE/.bvr/}"; ./bin/bvr-compose-single \"assets/root/\$FILE\" \"\$FILE_DST\""
-
+	-find assets/root/ -name "*.bvr" -printf "%f\n" | xargs -I % bash -c "FILE='%'; FILE_DST="dist/\$${FILE/.bvr/}"; ./bin/bvr-compose-single \"assets/root/\$$FILE\" \"\$$FILE_DST\""
 	# js bvr fajli
 	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 "*.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\""
 	cp -r assets/root/.well-known dist/
 
-- 
cgit v1.2.3