mirror of
https://github.com/novatiq/packages.git
synced 2026-07-31 07:43:06 +01:00
adblock: update 1.1.16
* new config option 'adb_restricted' to disable updates of the adblock config during runtime (no flash writes, disabled by default) * new update function, to apply latest configuration changes if needed (/etc/init.d/adblock cfgup) * fix dns redirect rule * various optimizations Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
@@ -10,11 +10,9 @@
|
||||
#
|
||||
LC_ALL=C
|
||||
|
||||
# script debug switch (disabled by default)
|
||||
# set 'DEBUG=1' to enable script debugging
|
||||
# quiet output if 'adb_debug' not set
|
||||
#
|
||||
DEBUG=0
|
||||
if [ $((DEBUG)) -eq 0 ]
|
||||
if [ -z "${adb_debug}" ]
|
||||
then
|
||||
exec 2>/dev/null
|
||||
fi
|
||||
@@ -37,7 +35,7 @@ fi
|
||||
# get current directory and set script/config version
|
||||
#
|
||||
adb_scriptdir="${0%/*}"
|
||||
adb_scriptver="1.1.15"
|
||||
adb_scriptver="1.1.16"
|
||||
adb_mincfgver="2.0"
|
||||
|
||||
# source in adblock function library
|
||||
@@ -303,8 +301,8 @@ then
|
||||
"${adb_uci}" -q set "adblock.global.adb_dnstoggle=on"
|
||||
/etc/init.d/dnsmasq restart
|
||||
sleep 1
|
||||
rc="$(ps | grep -q "[d]nsmasq"; printf ${?})"
|
||||
if [ $((rc)) -eq 0 ]
|
||||
check="$(ps | pgrep -f "dnsmasq")"
|
||||
if [ -n "${check}" ]
|
||||
then
|
||||
f_log "adblock lists with overall ${adb_count} domains loaded"
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user