adblock: update 1.3.1

* fix uclient-fetch detection
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken
2016-06-29 23:39:12 +02:00
parent f96f354ad1
commit 7cfd8bc44e
3 changed files with 12 additions and 8 deletions
+3 -3
View File
@@ -10,7 +10,7 @@
#
adb_pid="${$}"
adb_pidfile="/var/run/adblock.pid"
adb_scriptver="1.3.0"
adb_scriptver="1.3.1"
adb_mincfgver="2.2"
adb_scriptdir="${0%/*}"
if [ -r "${adb_pidfile}" ]
@@ -227,7 +227,7 @@ then
# generate a unique overall block list
#
sort -u "${adb_dnsdir}/${adb_dnsprefix}."* > "${adb_tmpdir}/blocklist.overall"
sort -u "${adb_dnsdir}/${adb_dnsprefix}"* > "${adb_tmpdir}/blocklist.overall"
# loop through all separate lists, ordered by size (ascending)
#
@@ -250,7 +250,7 @@ fi
# restart & check dnsmasq with newly generated set of block lists
#
if [ -n "${adb_revsrclist}" ] || [ "${rm_done}" = "true" ]
if [ -n "${adb_revsrclist}" ] || [ -n "${mv_done}" ] || [ "${rm_done}" = "true" ]
then
"${adb_uci}" -q delete "adblock.global.adb_dnstoggle"
/etc/init.d/dnsmasq restart