netdata/packaging/installer: Dont use --always, when git describe cant find a tag we have the alternative of packaging/version content file (#5860)
Paul Emm. Katsoulakis committed
Apr 13, 2019 at 10:52 UTC
065523a43c381f3e63a7d434756499e85b52efdd
2 files changed
+2
-2
configure.ac
+1
-1
@@ -5,7 +5,7 @@
5
AC_PREREQ(2.60)
6
7
# We do not use m4_esyscmd_s to support older autoconf.
8
-define([VERSION_STRING], m4_esyscmd([git describe --always 2>/dev/null | tr -d '\n']))
8
+define([VERSION_STRING], m4_esyscmd([git describe 2>/dev/null | tr -d '\n']))
9
define([VERSION_FROM_FILE], m4_esyscmd([cat packaging/version | tr -d '\n']))
10
m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_FROM_FILE)])
11
packaging/makeself/jobs/99-makeself.install.sh
+1
-1
@@ -8,7 +8,7 @@ run cd "${NETDATA_SOURCE_PATH}" || exit 1
8
# -----------------------------------------------------------------------------
9
# find the netdata version
10
11
-VERSION="$(git describe --always 2>/dev/null)"
11
+VERSION="$(git describe 2>/dev/null)"
12
if [ -z "${VERSION}" ]; then
13
VERSION=$(cat packaging/version)
14
fi