From ebfffea5dce3befd2ea6a1067228c5069a96cc64 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Fri, 3 Mar 2017 20:04:55 -0800 Subject: [PATCH] Always show something, even if it's just the short hash of the latest commit. Signed-off-by: Dan Schaper --- advanced/Scripts/version.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/advanced/Scripts/version.sh b/advanced/Scripts/version.sh index 27166507..3a04d2ec 100755 --- a/advanced/Scripts/version.sh +++ b/advanced/Scripts/version.sh @@ -8,8 +8,6 @@ # This file is copyright under the latest version of the EUPL. # Please see LICENSE file for your rights under this license. - - # Flags: latest=false current=false @@ -18,9 +16,9 @@ DEFAULT="-1" normalOutput() { piholeVersion=$(cd /etc/.pihole/ \ - && git describe --tags --abbrev=0) + && git describe --tags --always) webVersion=$(cd /var/www/html/admin/ \ - && git describe --tags --abbrev=0) + && git describe --tags --always) piholeHash=$(cd /etc/.pihole/ \ && git rev-parse --short HEAD)