From 8fa2322314340370f4c6bebd97f0910a7c6de358 Mon Sep 17 00:00:00 2001 From: angt Date: Fri, 1 Jan 2016 12:32:20 +0100 Subject: [PATCH] Add VERSION in the tarball --- Makefile.am | 9 +++++---- version.sh | 10 ++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 455dfcc..ece74cb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,7 +18,8 @@ glorytun_SOURCES = \ src/db.h EXTRA_DIST = \ - LICENSE \ - README.md \ - autogen.sh \ - version.sh + LICENSE \ + README.md \ + VERSION \ + autogen.sh \ + version.sh diff --git a/version.sh b/version.sh index c6ae5ec..204fd3f 100755 --- a/version.sh +++ b/version.sh @@ -3,9 +3,11 @@ [ -z "${VERSION}" ] && VERSION=`git describe --tags --always 2>/dev/null` \ && VERSION=${VERSION#v} -[ -z "${VERSION}" ] && VERSION=`basename \`pwd\`` \ - && VERSION=${VERSION#*-} +[ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null` -[ "$1" = "major" ] && VERSION=${VERSION%%.*} +[ -z "${VERSION}" ] && VERSION=0.0.0 -printf ${VERSION} +[ "$1" = "major" ] && printf ${VERSION%%.*} \ + && exit 0 + +printf ${VERSION} | tee VERSION