diff --git a/Makefile b/Makefile index 05e21278..fad41f24 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +BASTILLE_BRANCH=$$(git branch --show-current) BASTILLE_VERSION=$$(git rev-parse --short HEAD) .PHONY: all @@ -8,8 +9,8 @@ install: @echo "Installing Bastille" @echo @echo "Updating Bastille version to match git revision." - @echo "BASTILLE_VERSION: ${BASTILLE_VERSION}" - @sed -i.orig "s/BASTILLE_VERSION=.*/BASTILLE_VERSION=${BASTILLE_VERSION}/" usr/local/bin/bastille + @echo "BASTILLE_VERSION: ${BASTILLE_BRANCH}-${BASTILLE_VERSION}" + @sed -i '' "s/BASTILLE_VERSION=.*/BASTILLE_VERSION=${BASTILLE_BRANCH}-${BASTILLE_VERSION}/" usr/local/bin/bastille @cp -Rv usr / @echo @echo "This method is for testing & development."