OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

adblock: bugfix 2.1.2 

* fix minor build error in init script

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2017-01-20 09:57:33 +01:00
parent 43971e29a1
commit d960507c5f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/adblock/Makefile
View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=2.1.1 PKG_VERSION:=2.1.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-3.0+ PKG_LICENSE:=GPL-3.0+
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

13
net/adblock/files/adblock.init
View File

@ -9,9 +9,7 @@ EXTRA_HELP=" suspend Suspend adblock processing
resume Resume adblock processing resume Resume adblock processing
query <DOMAIN> Query active blocklists for specific domain" query <DOMAIN> Query active blocklists for specific domain"
exec 2>/dev/null
adb_script="/usr/bin/adblock.sh" adb_script="/usr/bin/adblock.sh"
adb_iface="$(uci -q get adblock.global.adb_iface)"
boot() boot()
{ {
@ -74,16 +72,17 @@ query()
service_triggers() service_triggers()
{ {
local iface local iface="$(uci -q get adblock.global.adb_iface)"
procd_add_config_trigger "config.change" "adblock" /etc/init.d/adblock start if [ -z "${iface}" ]
if [ -z "${adb_iface}" ]
then then
procd_add_raw_trigger "interface.*.up" 1000 /etc/init.d/adblock start procd_add_raw_trigger "interface.*.up" 1000 /etc/init.d/adblock start
else else
for iface in ${adb_iface} for name in ${iface}
do do
procd_add_interface_trigger "interface.*.up" "${iface}" /etc/init.d/adblock start procd_add_interface_trigger "interface.*.up" "${name}" /etc/init.d/adblock start
done done
fi fi
procd_add_config_trigger "config.change" "adblock" /etc/init.d/adblock start
} }

3
net/adblock/files/adblock.sh
View File

@ -10,7 +10,7 @@
# #
LC_ALL=C LC_ALL=C
PATH="/usr/sbin:/usr/bin:/sbin:/bin" PATH="/usr/sbin:/usr/bin:/sbin:/bin"
adb_ver="2.1.1" adb_ver="2.1.2"
adb_enabled=1 adb_enabled=1
adb_debug=0 adb_debug=0
adb_whitelist="/etc/adblock/adblock.whitelist" adb_whitelist="/etc/adblock/adblock.whitelist"
@ -295,6 +295,7 @@ f_log()
} }
# f_debug: gather memory & space information # f_debug: gather memory & space information
#
f_debug() f_debug()
{ {
local mem_total=0 mem_free=0 mem_swap=0 tmp_space=0 backup_space=0 local mem_total=0 mem_free=0 mem_swap=0 tmp_space=0 backup_space=0