diff --git a/Makefile b/Makefile index 6c152df30..d125f760e 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -SHELL=/bin/bash - .PHONY: publish test coveralls lint zero coverage VERSION=1.0.0-beta.16 diff --git a/templates/Makefile b/templates/Makefile index 13d2b784b..fa228e370 100755 --- a/templates/Makefile +++ b/templates/Makefile @@ -65,10 +65,10 @@ assets/classDiagram.svg: assets/classDiagram README.md: templates/README.md dist/lips.js .$(VERSION) $(GIT) branch | grep '* devel' > /dev/null && $(SED) -e "s/{{VER}}/DEV/g" -e \ - "s/{{VER_DASH}}/$(VERSION_DASH)/g" -e "s/{{BRANCH}}/$(BRANCH)/g" -e "s/{{CHECKSUM}}/$(TESTS_CHECKSUM)/g" \ + "s/{{VER_DASH}}/$(VERSION_DASH)/g" -e "s#{{BRANCH}}#$(BRANCH)#g" -e "s/{{CHECKSUM}}/$(TESTS_CHECKSUM)/g" \ -e "s/{{YEAR}}/${YEAR}/g" -e "s/{{DATE}}/${DATE_SHORT}/" -e "s/{{COMMIT}}/$(COMMIT)/g" \ < templates/README.md > README.md || \ - $(SED) -e "s/{{VER}}/$(VERSION)/g" -e "s/{{BRANCH}}/$(BRANCH)/g" -e "s/{{YEAR}}/${YEAR}/g" \ + $(SED) -e "s/{{VER}}/$(VERSION)/g" -e "s#{{BRANCH}}#$(BRANCH)#g" -e "s/{{YEAR}}/${YEAR}/g" \ -e "s/{{CHECKSUM}}/$(TESTS_CHECKSUM)/g" -e "s/{{COMMIT}}/$(COMMIT)/g" -e "s/{{DATE}}/${DATE_SHORT}/" \ -e "s/{{VER_DASH}}/$(VERSION_DASH)/g" < templates/README.md > README.md