@cryptotaxi247 / netdata-1 / commits / 026df645e

add version file and force git describe to always create a version (#5119)

Paweł Krupa committed Jan 4, 2019 at 18:53 UTC 026df645e4497acbe81df02245e64270821a0d71
4 files changed +7 -6
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 2>/dev/null | tr -d '\n']))
8 +define([VERSION_STRING], m4_esyscmd([git describe --always 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/installer/README.md
+4 -4
@@ -236,7 +236,7 @@ Do this to install and run Netdata:
236 ```sh
237
238 # download it - the directory 'netdata' will be created
239 -git clone https://github.com/netdata/netdata.git --depth=1
239 +git clone https://github.com/netdata/netdata.git --depth=100
240 cd netdata
241
242 # run script with root privileges to build, install, start Netdata
@@ -271,7 +271,7 @@ This is how to install the latest Netdata version from sources on FreeBSD:
271 pkg install bash e2fsprogs-libuuid git curl autoconf automake pkgconf pidof
272
273 # download Netdata
274 -git clone https://github.com/netdata/netdata.git --depth=1
274 +git clone https://github.com/netdata/netdata.git --depth=100
275
276 # install Netdata in /opt/netdata
277 cd netdata
@@ -339,7 +339,7 @@ click `Install` in the software update popup window, then
339 brew install ossp-uuid autoconf automake pkg-config
340
341 # download Netdata
342 -git clone https://github.com/netdata/netdata.git --depth=1
342 +git clone https://github.com/netdata/netdata.git --depth=100
343
344 # install Netdata in /usr/local/netdata
345 cd netdata
@@ -360,7 +360,7 @@ apk add alpine-sdk bash curl zlib-dev util-linux-dev libmnl-dev gcc make git aut
360 apk add nodejs
361
362 # download Netdata - the directory 'netdata' will be created
363 -git clone https://github.com/netdata/netdata.git --depth=1
363 +git clone https://github.com/netdata/netdata.git --depth=100
364 cd netdata
365
366
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 2>/dev/null)"
11 +VERSION="$(git describe --always 2>/dev/null)"
12 if [ -z "${VERSION}" ]; then
13 VERSION=$(cat packaging/version)
14 fi
packaging/version new
+1
@@ -0,0 +1 @@
1 +v1.12.0-rc2-5-nightly