vikarti.anatra/nginx-ultimate-bad-bot-blocker
1
0
Fork 0
mirror of https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker.git synced 2025-09-02 18:50:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

install-ngxblocker: use curl not wget

Browse source 
fixes https://github.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/issues/76

* download_files() now checks for missing & zero size files
* each download retries up to 10 times
* more informative download error messages
This commit is contained in:
Stuart Cardall 2017-08-23 19:32:42 +00:00
parent a42c9a2a25
commit b4e2e23fec
No known key found for this signature in database
GPG key ID: AEB857F1C891D0C6
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
install-ngxblocker
View file

@ -92,7 +92,7 @@ check_if_updating() {
} }
download_files() { download_files() {
local url= x= local_file= remote_path= remote_dir=$1 local_dir=$2 # rm leading whitespace 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 file_list="$(echo $@ | awk '{$1=$2=""; print $0}' | sed -e 's/^[ \t]*//')"
local col_size=$(( $(longest_str $file_list) + $(echo $remote_dir | wc -m) )) local col_size=$(( $(longest_str $file_list) + $(echo $remote_dir | wc -m) ))
@ -102,7 +102,7 @@ download_files() {
for x in $file_list; do for x in $file_list; do
local_file=$local_dir/$x local_file=$local_dir/$x
if [ ! -f $local_file ]; then if [ ! -f $local_file ] || [ ! -s $local_file ]; then
if [ "$remote_dir" = "/" ]; then if [ "$remote_dir" = "/" ]; then
remote_path=$x remote_path=$x
else else
@ -115,14 +115,17 @@ download_files() {
"[REPO]/$remote_path" \ "[REPO]/$remote_path" \
"[TO]=> $local_file" "[TO]=> $local_file"
tmp=$(mktemp)
url=$REPO/$remote_path url=$REPO/$remote_path
wget -q $url -O $local_file curl --fail --connect-timeout 60 --retry 10 --retry-delay 5 -so $tmp $url
if [ $? = 0 ]; then case "$?" in
printf "...OK\n" 0) printf "...OK\n"
else mv $tmp $local_file
printf "...ERROR downloading: $url\n" ;;
fi 22) printf "...ERROR 404: $url\n";;
28) printf "...ERROR TIMEOUT: $url\n";;
esac
else else
printf "%-21s %-$(( $col_size +8 ))s %s\n" \ printf "%-21s %-$(( $col_size +8 ))s %s\n" \
"Downloading [FROM]=>" \ "Downloading [FROM]=>" \