From 8c2f56b0e6b6f65189af942b7fabb78610c49277 Mon Sep 17 00:00:00 2001
From: RD WebDesign <github@rdwebdesign.com.br>
Date: Tue, 6 Dec 2022 17:38:38 -0300
Subject: [PATCH] Imporving the output from `os_check()` function

- add red color to dig errors
- reorder some output lines
- add "Distro and version supported" on success

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
---
 advanced/Scripts/piholeDebug.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index 17447873..f370bd9f 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -394,12 +394,11 @@ os_check() {
     # Extract dig response
     response="${cmdResult%%$'\n'*}"
 
-    log_write "${INFO} dig return code:  ${digReturnCode}"
-    log_write "${INFO} dig response:  ${response}"
-
     if [ "${digReturnCode}" -ne 0 ]; then
-        log_write "${INFO} Distro: ${COL_RED}${detected_os^}${COL_NC}"
-        log_write "${CROSS} Error:  ${COL_RED}dig command failed - Unable to check OS${COL_NC}"
+        log_write "${INFO} Distro: ${detected_os^}"
+        log_write "${CROSS} dig return code: ${COL_RED}${digReturnCode}${COL_NC}"
+        log_write "${CROSS} dig response: ${response}"
+        log_write "${CROSS} Error: ${COL_RED}dig command failed - Unable to check OS${COL_NC}"
     else
         IFS=" " read -r -a supportedOS < <(echo "${response}" | tr -d '"')
         for distro_and_versions in "${supportedOS[@]}"
@@ -421,19 +420,26 @@ os_check() {
             fi
         done
 
+        local finalmsg
         if [ "$valid_os" = true ]; then
             log_write "${TICK} Distro:  ${COL_GREEN}${detected_os^}${COL_NC}"
 
             if [ "$valid_version" = true ]; then
                 log_write "${TICK} Version: ${COL_GREEN}${detected_version}${COL_NC}"
+                finalmsg="${TICK} ${COL_GREEN}Distro and version supported${COL_NC}"
             else
                 log_write "${CROSS} Version: ${COL_RED}${detected_version}${COL_NC}"
-                log_write "${CROSS} Error: ${COL_RED}${detected_os^} is supported but version ${detected_version} is currently unsupported (${FAQ_HARDWARE_REQUIREMENTS})${COL_NC}"
+                finalmsg="${CROSS} Error: ${COL_RED}${detected_os^} is supported but version ${detected_version} is currently unsupported (${FAQ_HARDWARE_REQUIREMENTS})${COL_NC}"
             fi
         else
             log_write "${CROSS} Distro:  ${COL_RED}${detected_os^}${COL_NC}"
-            log_write "${CROSS} Error: ${COL_RED}${detected_os^} is not a supported distro (${FAQ_HARDWARE_REQUIREMENTS})${COL_NC}"
+            finalmsg="${CROSS} Error: ${COL_RED}${detected_os^} is not a supported distro (${FAQ_HARDWARE_REQUIREMENTS})${COL_NC}"
         fi
+
+        # Print dig response and the final check result
+        log_write "${INFO} dig return code: ${COL_RED}${digReturnCode}${COL_NC}"
+        log_write "${INFO} dig response: ${response}"
+        log_write "${finalmsg}"
     fi
 }