diff options
| author | Dan Schaper <dan.schaper@pi-hole.net> | 2017-03-04 07:04:55 +0300 |
|---|---|---|
| committer | Dan Schaper <dan.schaper@pi-hole.net> | 2017-03-04 07:04:55 +0300 |
| commit | ebfffea5dce3befd2ea6a1067228c5069a96cc64 (patch) | |
| tree | ab72291bc6871dda8a20e5e35b837d7a9117c3ec /advanced/Scripts/version.sh | |
| parent | 81939ab265f9b85516f673df3b3b13467371ded7 (diff) | |
Always show something, even if it's just the short hash of the latest commit.
Signed-off-by: Dan Schaper <dan.schaper@pi-hole.net>
Diffstat (limited to 'advanced/Scripts/version.sh')
| -rwxr-xr-x | advanced/Scripts/version.sh | 6 |
1 files 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) |