From 07e37d7fc3a2a36ac0e028cf74a54e13793b2d83 Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Mon, 13 Feb 2017 11:33:09 +0100
Subject: [PATCH] Proper error handling

---
 automated install/basic-install.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
index 37fe469d..64a190e2 100755
--- a/automated install/basic-install.sh	
+++ b/automated install/basic-install.sh	
@@ -1026,8 +1026,9 @@ installPihole() {
   fi
   installCron
   installLogrotate
-  FTLdownload
-  FTLinstall
+  if FTLdownload; then
+    FTLinstall
+  fi
   configureFirewall
   finalExports
   #runGravity
@@ -1059,8 +1060,9 @@ updatePihole() {
   fi
   installCron
   installLogrotate
-  FTLdownload
-  FTLinstall
+  if FTLdownload; then
+    FTLinstall
+  fi
   finalExports #re-export setupVars.conf to account for any new vars added in new versions
   #runGravity
 }
@@ -1185,10 +1187,13 @@ FTLdownload() {
   latesttag=$(curl -s https://api.github.com/repos/pi-hole/FTL/releases/latest | grep "tag_name" | sed "s/.*: \"//;s/\",//;")
   if [ ! "${latesttag}" ]; then
     echo "Error in getting latest release tag from GitHub"
-    return 0
+    return 1
+  fi
+  if curl -sSL --fail "https://github.com/pi-hole/FTL/releases/download/${latesttag}/${binary}" -o "/opt/pihole/pihole-FTL"; then
+    return 0
+  else
+    return 1
   fi
-  curl -sSL "https://github.com/pi-hole/FTL/releases/download/${latesttag}/${binary}" -o "/opt/pihole/pihole-FTL"
-  return 0
 }
 
 FTLinstall() {