From f6f18520b9677703194a0180f41b28aa10acb23c Mon Sep 17 00:00:00 2001 From: Drew Kerrigan Date: Thu, 2 Jun 2016 14:30:25 -0400 Subject: [PATCH] removing arch from PKGNAME --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ebe016d..eea38d6 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,8 @@ REPO ?= riak_explorer PKG_VERSION ?= $(shell git describe --tags --abbrev=0 | tr - .) -ARCH ?= amd64 OS_FAMILY ?= ubuntu OS_VERSION ?= 14.04 -PKGNAME ?= $(REPO)-$(PKG_VERSION)-$(OS_FAMILY)-$(OS_VERSION)-$(ARCH).tar.gz +PKGNAME ?= $(REPO)-$(PKG_VERSION)-$(OS_FAMILY)-$(OS_VERSION).tar.gz OAUTH_TOKEN ?= $(shell cat oauth.txt) GIT_TAG ?= $(shell git describe --tags --abbrev=0) RELEASE_ID ?= $(shell curl -sS https://api.github.com/repos/basho-labs/$(REPO)/releases/tags/$(GIT_TAG)?access_token=$(OAUTH_TOKEN) | python -c 'import sys, json; print json.load(sys.stdin)["id"]') @@ -90,7 +89,7 @@ sync-delete-standalone: RIAK_BASE ?= root PATCH_PKG_VERSION ?= $(PKG_VERSION).patch -PATCH_PKGNAME ?= $(REPO)-$(PATCH_PKG_VERSION)-$(OS_FAMILY)-$(OS_VERSION)-$(ARCH).tar.gz +PATCH_PKGNAME ?= $(REPO)-$(PATCH_PKG_VERSION)-$(OS_FAMILY)-$(OS_VERSION).tar.gz PATCH_DEPLOY_BASE ?= "https://uploads.github.com/repos/basho-labs/$(REPO)/releases/$(RELEASE_ID)/assets?access_token=$(OAUTH_TOKEN)&name=$(PATCH_PKGNAME)" PATCH_DOWNLOAD_BASE ?= https://github.com/basho-labs/$(REPO)/releases/download/$(GIT_TAG)/$(PATCH_PKGNAME)