From aa10ba23e18cc79fb7f916e2d5a4738a23d02a5d Mon Sep 17 00:00:00 2001
From: Asif Bacchus <asif@programming.bacchus.network>
Date: Wed, 12 Sep 2018 04:39:37 -0600
Subject: [PATCH] Changed echo section to display CloudFlare results based on
 array index.

---
 cfddns.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/cfddns.sh b/cfddns.sh
index b5f9970..d4adcf7 100755
--- a/cfddns.sh
+++ b/cfddns.sh
@@ -150,9 +150,18 @@ fi
 
 
 ## Check if desired record(s) exist at CloudFlare
+echo -e "\e[0;36mPerforming CloudFlare lookup on specified DNS records...\e[0m"
 for cfLookup in "${dnsRecords[@]}"; do
 record+=("$(curl -s -X GET "https://api.cloudflare.com/client/v4/zones/${cfDetails[2]}/dns_records?name=$cfLookup&type=A" -H "X-Auth-Email: ${cfDetails[0]}" -H "X-Auth-Key: ${cfDetails[1]}" -H "Content-Type: application/json")")
 done
+cfLookupResult=$(echo "$?")
+if [ "$ipLookupResult" -ne 0 ]; then
+    echo -e "\e[1;31mThere was a problem accessing the CloudFlare API"
+    echo -e "\e[0;31mPlease re-run this script later.\e[0m"
+    exit 254
+else
+    echo -e "\e[0;36m...done"
+fi
 
 
 ### Echo results (testing)
@@ -173,8 +182,13 @@ echo -e "\e[0m\n"
 echo -e "\e[0;39mRecord check:"
 echo "Array length: ${#record[@]}"
 echo "Results:"
-for cfResult in "${record[@]}"; do
-    echo -e "\n$cfResult"
+for recordIdx in "${!record[@]}"; do
+    echo -e "\n\e[0;33mResult for ${dnsRecords[recordIdx]}:\e[0m"
+    if [[ ${record[recordIdx]} == *"\"count\":0"* ]]; then
+        echo -e "\e[0;31m***not found in your CloudFlare DNS records***\e[0m"
+    else
+    echo -e "${record[recordIdx]}"
+    fi
 done
 
 exit 0