adblock: adapt openwrt rc.common changes

* since openwrt master has merged the depending P/R, the old
extra_help/extra_commands syntax is no longer working, see #13798 for
reference

* removed test.sh script from package

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2020-11-03 19:51:46 +01:00
parent 4a94d960c9
commit 9922c8e3e0
No known key found for this signature in database
GPG key ID: 9D71CD547BFAE684
3 changed files with 8 additions and 12 deletions

View file

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=adblock PKG_NAME:=adblock
PKG_VERSION:=4.0.7 PKG_VERSION:=4.0.7
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org> PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>

View file

@ -8,14 +8,13 @@
START=30 START=30
USE_PROCD=1 USE_PROCD=1
EXTRA_COMMANDS="suspend resume query report list timer status_service version" extra_command "suspend" "Suspend adblock processing"
EXTRA_HELP=" suspend Suspend adblock processing extra_command "resume" "Resume adblock processing"
resume Resume adblock processing extra_command "query" "<domain> Query active blocklists and backups for a specific domain"
query <domain> Query active blocklists and backups for a specific domain extra_command "report" "[<search>] Print DNS statistics with an optional search parameter"
report [<search>] Print DNS statistics with an optional search parameter extra_command "list" "[[<add>|<remove>] [source(s)]] List available adblock sources or add/remove them from config"
list [[<add>|<remove>] [source(s)]] List available adblock sources or add/remove them from config extra_command "timer" "<action> <hour> [<minute>] [<weekday>] Set a cron based update interval"
timer <action> <hour> [<minute>] [<weekday>] Set a cron based update interval extra_command "version" "Print version information"
version print version information"
adb_init="/etc/init.d/adblock" adb_init="/etc/init.d/adblock"
adb_script="/usr/bin/adblock.sh" adb_script="/usr/bin/adblock.sh"

View file

@ -1,3 +0,0 @@
#!/bin/sh
/etc/init.d/"${1}" version 2>/dev/null | grep "${2}"