Correctly save the version (Git commit id)

diff --git a/contrib/debian/build-new-package.sh b/contrib/debian/build-new-package.sh
index 6e3c1f60910f93c9e31861c3b93497495f3b7d42..0218bf7bda37ebf78e9b8c6d282285f4bb87a563 100755 (executable)
--- a/contrib/debian/build-new-package.sh
+++ b/contrib/debian/build-new-package.sh
@@ -16,6 +16,9 @@ git pull --ff-only origin master
 
 descr=$(git describe)
 
+COMMIT_ID=$(git rev-parse HEAD)
+export COMMIT_ID
+
 git checkout "$branch"
 
 if [ "$old_descr" = "$descr" ]; then

diff --git a/contrib/debian/changelog b/contrib/debian/changelog
index 3e815232c3d0f9e7dbe828b71e10a7b7348c7c9f..ac8b0ee70f4974afc54054a680a9b226a364d139 100644 (file)
--- a/contrib/debian/changelog
+++ b/contrib/debian/changelog
@@ -1,3 +1,10 @@
+netdata (0.20170201.01-0ab3) UNRELEASED; urgency=medium
+
+  * Correctly save the version (Git commit id) when building with the
+    contrib/debian/build-new-package.sh script.
+
+ -- Alexander Barton <alex@barton.de>  Wed, 01 Feb 2017 23:40:48 +0100
+
 netdata (0.20170201.01-0ab2) unstable; urgency=medium
 
   * contrib/debian/build-new-package.sh

diff --git a/contrib/debian/rules b/contrib/debian/rules
index ec4ec41821b9b58e8bb487fc519b06915c59e803..6b417d33088ac6604cc62175b6591d5adf9b2d6e 100755 (executable)
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -25,6 +25,11 @@ debian/%.postinst: debian/%.postinst.in
 override_dh_install: debian/netdata.postinst
        dh_install
 
+       # Set correct version (Git commit id) when called by the
+       # contrib/debian/build-new-package.sh script:
+       #
+       [ -z "$$COMMIT_ID" ] || echo "$$COMMIT_ID" >$(TOP)/var/lib/netdata/www/version.txt
+
        # Remove unneeded .keep files
        #
        find "$(TOP)" -name .keep -exec rm '{}' ';'