Skip to content

update-ngxblocker: fix dash incompatibility / use curl not wget #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 24, 2017
Merged

update-ngxblocker: fix dash incompatibility / use curl not wget #78

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26fec01
update-ngxblocker: fix dash shell incompatibility
itoffshore Aug 23, 2017
c62ef4f
update-ngxblocker: use curl not wget
itoffshore Aug 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions update-ngxblocker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ check_version() {
}

check_dirs() {
local x= dirs=$@
local x= dirs="$@"

for x in $dirs; do
if [ ! -d $x ]; then
Expand Down Expand Up @@ -263,7 +263,7 @@ get_options() {

main() {
local REPO=https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master
local file=globalblacklist.conf remote_dir=conf.d url= output= update= status=
local file=globalblacklist.conf remote_dir=conf.d url= output= update= status= tmp=
# default to service (centos does not have 'which' by default)
local service=${service_cmd:-"service"}

Expand All @@ -274,10 +274,10 @@ main() {
fi

check_depends
check_dirs $BOTS_DIR $CONF_DIR $SCRIPT_DIR

# parse command line
get_options $@
check_dirs $BOTS_DIR $CONF_DIR
url=$REPO/$remote_dir/$file
output=$CONF_DIR/$file

Expand All @@ -288,8 +288,18 @@ main() {
if echo $update | grep ^Update 1>/dev/null; then

# download globalblacklist update
tmp=$(mktemp)
mkdir -p $CONF_DIR
wget $url $(wget_opts) -O $output 2>&1
printf "${BOLDWHITE}Downloading: $file "
curl --fail --connect-timeout 60 --retry 10 --retry-delay 5 -so $tmp $url

case "$?" in
0) printf "...${BOLDGREEN}OK${RESET}\n\n"
mv $tmp $output
;;
22) printf "...${BOLDRED}ERROR 404: $url${RESET}\n\n";;
28) printf "...${BOLDRED}ERROR TIMEOUT: $url${RESET}\n\n";;
esac

# download new bots.d / conf.d files
$INSTALL_INC
Expand Down