Browse Source

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 6 years ago
parent
commit
065523a43c
2 changed files with 2 additions and 2 deletions
  1. 1 1
      configure.ac
  2. 1 1
      packaging/makeself/jobs/99-makeself.install.sh

+ 1 - 1
configure.ac

@@ -5,7 +5,7 @@
 AC_PREREQ(2.60)
 
 # We do not use m4_esyscmd_s to support older autoconf.
-define([VERSION_STRING], m4_esyscmd([git describe --always 2>/dev/null | tr -d '\n']))
+define([VERSION_STRING], m4_esyscmd([git describe 2>/dev/null | tr -d '\n']))
 define([VERSION_FROM_FILE], m4_esyscmd([cat packaging/version | tr -d '\n']))
 m4_ifval(VERSION_STRING, [], [define([VERSION_STRING], VERSION_FROM_FILE)])
 

+ 1 - 1
packaging/makeself/jobs/99-makeself.install.sh

@@ -8,7 +8,7 @@ run cd "${NETDATA_SOURCE_PATH}" || exit 1
 # -----------------------------------------------------------------------------
 # find the netdata version
 
-VERSION="$(git describe --always 2>/dev/null)"
+VERSION="$(git describe 2>/dev/null)"
 if [ -z "${VERSION}" ]; then
     VERSION=$(cat packaging/version)
 fi