mirror
/
openwrt-packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Releases Activity

simple-adblock: update to 1.8.8-1 

* update 'check' function

Signed-off-by: Stan Grishin <stangri@melmac.net>
(cherry picked from commit d11f310230)
This commit is contained in:
Stan Grishin 2021-10-15 21:25:08 +00:00
parent 6acf83e2e0
commit b7bec631e2
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/simple-adblock/Makefile
View File

@ -5,8 +5,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=simple-adblock
PKG_VERSION:=1.8.7
PKG_RELEASE:=6
PKG_VERSION:=1.8.8
PKG_RELEASE:=1
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.net>
PKG_LICENSE:=GPL-3.0-or-later

37
net/simple-adblock/files/simple-adblock.init
View File

@ -1083,32 +1083,37 @@ service_triggers() {
check() {
load_package_config
local c string="$1"
local c string="$1"
c="$(grep -c "$string" "$outputFile")"
c="${c:-0}"
if [ ! -s "$outputFile" ]; then
echo "No block-list ('$outputFile') found."
elif [ -z "$string" ]; then
echo "Usage: /etc/init.d/${packageName} check string"
elif [ "$c" -gt 0 ]; then
if [ "$c" -gt 1 ]; then
if [ "$c" -eq 1 ]; then
echo "Found 1 match for '$string' in '$outputFile':"
elif [ "$c" -le 20 ]; then
echo "Found $c matches for '$string' in '$outputFile':"
else
echo "Found 1 match for '$string' in '$outputFile':"
echo "Found $c matches for '$string' in '$outputFile'."
fi
if [ "$c" -le 20 ]; then
case "$targetDNS" in
dnsmasq.addnhosts)
grep "$string" "$outputFile" | sed 's|^127.0.0.1 ||;s|^:: ||;';;
dnsmasq.conf)
grep "$string" "$outputFile" | sed 's|local=/||;s|/$||;';;
dnsmasq.ipset)
grep "$string" "$outputFile" | sed 's|ipset=/||;s|/adb$||;';;
dnsmasq.servers)
grep "$string" "$outputFile" | sed 's|server=/||;s|/$||;';;
unbound.adb_list)
grep "$string" "$outputFile" | sed 's|^local-zone: "||;s|" static$||;';;
esac
fi
case "$targetDNS" in
dnsmasq.addnhosts)
grep "$string" "$outputFile" | sed 's|^127.0.0.1 ||;s|^:: ||;';;
dnsmasq.conf)
grep "$string" "$outputFile" | sed 's|local=/||;s|/$||;';;
dnsmasq.ipset)
grep "$string" "$outputFile" | sed 's|ipset=/||;s|/adb$||;';;
dnsmasq.servers)
grep "$string" "$outputFile" | sed 's|server=/||;s|/$||;';;
unbound.adb_list)
grep "$string" "$outputFile" | sed 's|^local-zone: "||;s|" static$||;';;
esac
else
echo "The $string is not found in current block-list ('$outputFile')."
echo "The '$string' is not found in current block-list ('$outputFile')."
fi
}