Skip to content

Commit

Permalink
removing arch from PKGNAME
Browse files Browse the repository at this point in the history
  • Loading branch information
drewkerrigan committed Jun 2, 2016
1 parent 6e2827c commit f6f1852
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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"]')
Expand Down Expand Up @@ -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)

Expand Down

0 comments on commit f6f1852

Please sign in to comment.