From e1382317b1f1c209c118d24b309e781b41d9de15 Mon Sep 17 00:00:00 2001
From: Dan Schaper <dan.schaper@pi-hole.net>
Date: Wed, 16 Nov 2016 22:23:33 -0800
Subject: [PATCH] Finish up shellcheck and catch the final exit.

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

diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index fcb4dedc..57bf6a76 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -401,7 +401,9 @@ finalWork() {
     esac
 
     if [[ "${tricorder}" ]]; then
-      echo "::: Your debug token is : ${tricorder}"
+      echo ":::"
+      log_echo "::: Your debug token is : ${tricorder}"
+      echo ":::"
       echo "::: Please contact the Pi-hole team with your token for assistance."
       echo "::: Thank you."
     else
@@ -414,7 +416,16 @@ finalWork() {
 echo "::: A local copy of the Debug log can be found at : /var/log/pihole_debug.log"
 }
 
+count_gravity() {
+header_write "Analyzing gravity.list"
 
+  gravity_length=$(wc -l "${GRAVITYFILE}")
+  if [[ "${gravity_length}" ]]; then
+    log_write "${GRAVITYFILE} is ${gravity_length} lines long."
+  else
+    log_echo "Warning: No gravity.list file found!"
+  fi
+}
 ### END FUNCTIONS ###
 
 # Gather version of required packages / repositories
@@ -440,13 +451,7 @@ files_check "${WHITELISTFILE}"
 files_check "${BLACKLISTFILE}"
 files_check "${ADLISTFILE}"
 
-
-header_write "Analyzing gravity.list"
-
-  gravity_length=$(wc -l "${GRAVITYFILE}") \
-  && log_write "${GRAVITYFILE} is ${gravity_length} lines long." \
-  || log_echo "Warning: No gravity.list file found!"
-
+count_gravity
 dumpPiHoleLog
 
 trap finalWork EXIT