From c5968625e8561ff1fda6e05bc4cff9952d7197e5 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 21 Mar 2015 15:53:47 +0100 Subject: [PATCH] Use better version naming scheme for autoupdater compat --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cf95a3b..a71cc62 100644 --- a/Makefile +++ b/Makefile @@ -4,12 +4,10 @@ GLUON_GIT_REF := 754e4af1d738ebb84fd63bd98d6b606613202898 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key -_GIT_DESCRIBE = $(shell git describe --tags 2>/dev/null) -ifneq (,${_GIT_DESCRIBE}) - GLUON_RELEASE := ${_GIT_DESCRIBE} +GLUON_RELEASE := $(shell git describe --tags 2>/dev/null) +ifneq (,$(shell git describe --exact-match --tags 2>/dev/null)) GLUON_BRANCH := stable else - GLUON_RELEASE ?= snapshot~$(shell date '+%Y%m%d')~$(shell git describe --always) GLUON_BRANCH := experimental endif