From 88179046f564de89d8c10eaf5b9f901bb3b51ba8 Mon Sep 17 00:00:00 2001
From: Stuart Cardall <developer@it-offshore.co.uk>
Date: Sat, 26 Aug 2017 20:08:54 +0000
Subject: [PATCH 1/2] install-ngxblocker: print all curl errors

* also print curl errors besides 404 / timeouts
---
 install-ngxblocker | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/install-ngxblocker b/install-ngxblocker
index 8881947ae..4ebb34a12 100755
--- a/install-ngxblocker
+++ b/install-ngxblocker
@@ -92,8 +92,8 @@ check_if_updating() {
 }
 
 download_files() {
-	local url= x= local_file= remote_path= remote_dir=$1 local_dir=$2 tmp= # rm leading whitespace
-	local file_list="$(echo $@ | awk '{$1=$2=""; print $0}' | sed -e 's/^[ \t]*//')"
+	local url= x= local_file= remote_path= remote_dir=$1 local_dir=$2 tmp= retval=
+	local file_list="$(echo $@ | awk '{$1=$2=""; print $0}' | sed -e 's/^[ \t]*//')" # rm leading whitespace
 	local col_size=$(( $(longest_str $file_list) + $(echo $remote_dir | wc -m) ))
 
 	if [ -n "$(check_if_updating $local_dir $file_list)" ]; then
@@ -118,13 +118,15 @@ download_files() {
 					tmp=$(mktemp)
 					url=$REPO/$remote_path
 					curl --fail --connect-timeout 60 --retry 10 --retry-delay 5 -so $tmp $url
+					retval=$?
 
-					case "$?" in
+					case "$retval" in
 						 0) printf "...OK\n"
 						    mv $tmp $local_file
 						    ;;
 						22) printf "...ERROR 404: $url\n";;
 						28) printf "...ERROR TIMEOUT: $url\n";;
+						 *) printf "...ERROR CURL: ($retval)\n";;
 					esac
 				else
 					printf "%-21s %-$(( $col_size +8 ))s %s\n" \

From 287d8688cda27f589f86bcefddcbd6eb6741bee5 Mon Sep 17 00:00:00 2001
From: Stuart Cardall <developer@it-offshore.co.uk>
Date: Sat, 26 Aug 2017 20:10:21 +0000
Subject: [PATCH 2/2] update-ngxblocker: print all curl errors

* also print curl errors besides 404 / timeouts
---
 update-ngxblocker | 1 +
 1 file changed, 1 insertion(+)

diff --git a/update-ngxblocker b/update-ngxblocker
index f786d382b..93fb04547 100755
--- a/update-ngxblocker
+++ b/update-ngxblocker
@@ -289,6 +289,7 @@ main() {
 			    ;;
 			22) printf "...${BOLDRED}ERROR 404: $url${RESET}\n\n";;
 			28) printf "...${BOLDRED}ERROR TIMEOUT: $url${RESET}\n\n";;
+			 *) printf "...${BOLDRED}ERROR CURL: ($retval){RESET}\n\n";;
 		esac
 
 		# download new bots.d / conf.d files