From c15417011dd2c4946c65ca8a5b3bfb96081248f0 Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Thu, 27 Jun 2019 03:32:52 -0700 Subject: [PATCH] jeeez. --- Makefile | 2 +- scripts/formula-deploy.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a0967467..32c48eb1 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ uninstall: rm -f /etc/systemd/system/$(BINARY).service # Prepare a release. Called in Travis CI. -release: clean vendor test macos windows formula $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb +release: clean vendor test macos windows $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb # Prepareing a release! mkdir -p release mv $(BINARY).linux $(BINARY).macos release/ diff --git a/scripts/formula-deploy.sh b/scripts/formula-deploy.sh index bef4d13c..88fadda2 100755 --- a/scripts/formula-deploy.sh +++ b/scripts/formula-deploy.sh @@ -7,6 +7,10 @@ if [ -z "$VERSION" ]; then VERSION=$TRAVIS_TAG fi +VERSION=$(echo $VERSION|tr -d v) + +make unpacker-poller.rb VERSION=$VERSION + if [ -z "$VERSION" ]; then VERSION=$(grep -E 'archive/v.*tar.gz\s*"' unpacker-poller.rb | grep -Eo 'v([0-9]+\.[0-9]+\.[0-9]*)') fi