From 91a2d052a7975d543e35d2d38aa65293e3b11e46 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Fri, 28 Jun 2019 20:49:56 -0700
Subject: [PATCH 1/3] Fix pihole -up showing FTL update when network is down

Fixes #1877

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 automated install/basic-install.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 1e87b943..baeaaa9d 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -2402,6 +2402,11 @@ FTLcheckUpdate() {
             local FTLlatesttag
             FTLlatesttag=$(curl -sI https://github.com/pi-hole/FTL/releases/latest | grep 'Location' | awk -F '/' '{print $NF}' | tr -d '\r\n')
 
+            if [[ $? != 0 ]]; then
+                # There was an issue while retrieving the latest version
+                return 3
+            fi
+
             if [[ "${FTLversion}" != "${FTLlatesttag}" ]]; then
                 return 0
             else

From 37e7cd5211516e87fe84e5b908b93ae9aee6e2d5 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Fri, 28 Jun 2019 20:57:05 -0700
Subject: [PATCH 2/3] Fix ShellCheck issue by refactoring a bit

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 automated install/basic-install.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index baeaaa9d..380b424f 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -2399,14 +2399,16 @@ FTLcheckUpdate() {
         if [[ ${ftlLoc} ]]; then
             local FTLversion
             FTLversion=$(/usr/bin/pihole-FTL tag)
+            local FTLreleaseData
             local FTLlatesttag
-            FTLlatesttag=$(curl -sI https://github.com/pi-hole/FTL/releases/latest | grep 'Location' | awk -F '/' '{print $NF}' | tr -d '\r\n')
 
-            if [[ $? != 0 ]]; then
+            if ! FTLreleaseData=$(curl -sI https://github.com/pi-hole/FTL/releases/latest); then
                 # There was an issue while retrieving the latest version
                 return 3
             fi
 
+            FTLlatesttag=$(grep 'Location' < "${FTLreleaseData}" | awk -F '/' '{print $NF}' | tr -d '\r\n')
+
             if [[ "${FTLversion}" != "${FTLlatesttag}" ]]; then
                 return 0
             else

From 38ff3431340d3d35307aa7c6b18aebad9d1ff7e6 Mon Sep 17 00:00:00 2001
From: Mcat12 <newtoncat12@yahoo.com>
Date: Fri, 19 Jul 2019 17:35:21 -0700
Subject: [PATCH 3/3] Print an error message if the FTL release metadata
 download fails

Signed-off-by: Mcat12 <newtoncat12@yahoo.com>
---
 automated install/basic-install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 380b424f..3641b961 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -2404,6 +2404,7 @@ FTLcheckUpdate() {
 
             if ! FTLreleaseData=$(curl -sI https://github.com/pi-hole/FTL/releases/latest); then
                 # There was an issue while retrieving the latest version
+                printf "  %b Failed to retrieve latest FTL release metadata" "${CROSS}"
                 return 3
             fi