Windy/juci
1
0
Fork 0
mirror of https://github.com/mkschreder/juci.git synced 2025-01-09 04:19:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

revert to using echo -e so it works with bash (I don't care about dash for now)

Browse Source 
- if you have any blank page problems or index.html not created do this:

	rm -f /bin/sh
	ln -s /bin/bash /bin/sh
This commit is contained in:
Martin Schröder 2015-10-28 09:35:05 +01:00
parent cb980c0cb6
commit 5a9cdd93c7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -44,17 +44,17 @@ define BuildDir-y
$(eval STYLES_$(1):=$(wildcard $(addprefix $(2)/,$(STYLES-y))))
PHONY += $(1)-install
$(CODE_DIR)/$(CODE_LOAD)-$(1).js: $(JAVASCRIPT_$(1))
@echo "\033[0;33m[JS]\t$(1) -> $$@\033[m"
@echo -e "\033[0;33m[JS]\t$(1) -> $$@\033[m"
@#echo " * $$^"
@echo "" > $$@
$(Q)if [ "" != "$$^" ]; then for file in $$^; do cat $$$$file >> $$@; echo "" >> $$@; done; fi
$(CSS_DIR)/$(STYLE_LOAD)-$(1).css: $(STYLES_$(1))
@echo "\033[0;33m[CSS]\t$(1) -> $$@\033[m"
@echo -e "\033[0;33m[CSS]\t$(1) -> $$@\033[m"
@#echo " * $$(STYLES_$(1))"
@echo "" > $$@
$(Q)if [ "" != "$$^" ]; then for file in $$^; do cat $$$$file >> $$@; echo "" >> $$@; done; fi
$(CODE_DIR)/$(TPL_LOAD)-$(1).tpl.js: $(TEMPLATES_$(1))
@echo "\033[0;33m[HTML]\t$(1) -> $$@\033[m"
@echo -e "\033[0;33m[HTML]\t$(1) -> $$@\033[m"
@#echo " * $$^"
@echo "" > $$@
$(Q)if [ "" != "$$^" ]; then ./juci-build-tpl-cache $$^ $$@; fi
@ -123,16 +123,16 @@ release: prepare $(TARGETS) node_modules $(UBUS_MODS)
@if [ "$(CONFIG_PACKAGE_juci)" = "y" ]; then ./juci-update $(BIN)/www RELEASE; fi
debug: prepare $(TARGETS) $(UBUS_MODS)
@echo "\033[0;33m [GRUNT] $@ \033[m"
@echo -e "\033[0;33m [GRUNT] $@ \033[m"
@grunt
@echo "\033[0;33m [UPDATE] $@ \033[m"
@echo -e "\033[0;33m [UPDATE] $@ \033[m"
@./juci-update $(BIN)/www DEBUG
DOCS_MD:= README.md $(wildcard juci/docs/*.md docs/*.md plugins/**/docs/*.md) docs/juci.md
DOCS_HTML:= $(patsubst %.md,%.html,$(DOCS_MD)) docs/juci.html
PHONY+=docs
docs: $(DOCS_HTML)
@echo "\033[0;33m [DOCS] $@ $^ \033[m"
@echo -e "\033[0;33m [DOCS] $@ $^ \033[m"
@mkdir -p manual/js
@mkdir -p manual/css
@cp juci/src/lib/js/bootstrap.min.js manual/js/
@ -145,7 +145,7 @@ docs/juci.md: $(wildcard plugins/**/docs/*.md)
@./scripts/build_docs .
%.html: %.md
@echo "\033[0;33m[DOC]: $^\033[m"
@echo -e "\033[0;33m[DOC]: $^\033[m"
@mkdir -p manual
@ronn --pipe -f $^ > docs/.tmp.ronn
@cp docs/page.html.tpl docs/.tmp