From e9a7c2f5f7e5ca7609f0ca9eb0727b6f199919e2 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Thu, 8 Dec 2016 17:20:39 -0500
Subject: [PATCH] Assume version is vDev if not on master branch

This removes the need for a vDev tag, which was less reliable
because it needed to be the most recent tag in the dev branch and
was really just an sign that the repo was on a branch besides
master.
---
 footer.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/footer.php b/footer.php
index 2d3d6d61..309738ff 100644
--- a/footer.php
+++ b/footer.php
@@ -5,8 +5,20 @@
     <footer class="main-footer">
         <div class="pull-right hidden-xs">
             <?php
-            $piholeVersion = exec("cd /etc/.pihole/ && git describe --tags --abbrev=0");
-            $webVersion = exec("git describe --tags --abbrev=0");
+            // Check if on a dev branch
+            $piholeVersion = exec("cd /etc/.pihole/ && git rev-parse --abbrev-ref HEAD");
+            $webVersion = exec("git rev-parse --abbrev-ref HEAD");
+
+            // Use vDev if not on master
+            if($piholeVersion !== "master")
+                $piholeVersion = "vDev";
+            else
+                $piholeVersion = exec("cd /etc/.pihole/ && git describe --tags --abbrev=0");
+
+            if($webVersion !== "master")
+                $webVersion = "vDev";
+            else
+                $webVersion = exec("git describe --tags --abbrev=0");
             ?>
             <b>Pi-hole Version </b> <span id="piholeVersion"><?php echo $piholeVersion; ?></span>
             <b>Web Interface Version </b> <span id="webVersion"><?php echo $webVersion; ?></span>