From fb70fd77e8d0e05ebe7836d32c9bed3edd7eb0e7 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dschaper@ganymeade.com>
Date: Tue, 25 Oct 2016 17:50:14 -0700
Subject: [PATCH] Prototype version_check, add helper functions for logging and
 echo.

---
 advanced/Scripts/piholeDebug.sh | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index 8f8425df..c62aa1eb 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -56,20 +56,24 @@ header_write() {
   echo "" >> "${DEBUG_LOG}"
 }
 
+log_echo() {
+  echo ":::       ${1}"
+  log_write "${1}"
+}
+
 version_check() {
   header_write "Installed Package Versions"
 	echo ":::     Detecting Pi-hole installed versions."
 
 	pi_hole_ver="$(cd /etc/.pihole/ && git describe --tags --abbrev=0)" \
-	&& log_write "Pi-hole Version: $pi_hole_ver" || log_write "Pi-hole git repository not detected."
+	&& log_echo "Pi-hole: $pi_hole_ver" || log_echo "Pi-hole git repository not detected."
 	admin_ver="$(cd /var/www/html/admin && git describe --tags --abbrev=0)" \
-	&& log_write "WebUI Version: $admin_ver" || log_write "Pi-hole Admin Pages git repository not detected."
-
-	echo ":::     Writing lighttpd version to logfile."
-	light_ver="$(lighttpd -v |& head -n1)" && log_write "${light_ver}" || log_write "lighttpd not installed."
-
-	echo ":::     Writing PHP version to logfile."
-	php_ver="$(php -v |& head -n1)" && log_write "${php_ver}" || log_write "PHP not installed."
+	&& log_echo "WebUI: $admin_ver" || log_echo "Pi-hole Admin Pages git repository not detected."
+	light_ver="$(lighttpd -v |& head -n1 | cut -d " " -f1)" \
+	&& log_echo "${light_ver}" || log_echo "lighttpd not installed."
+	php_ver="$(php -v |& head -n1)" \
+	&& log_echo "${php_ver}" || log_echo "PHP not installed."
+	echo ":::"
 }
 
 files_check() {