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

adblock-fast: bugfix: properly identify hosts-files 

* escape dots in grep command to properly identify hosts files

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 13a88d0b79)
This commit is contained in:
Stan Grishin 2023-10-05 14:51:51 +00:00
parent 1458dc5589
commit 80bc44cb7b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/adblock-fast/Makefile
View File

@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=adblock-fast PKG_NAME:=adblock-fast
PKG_VERSION:=1.0.0 PKG_VERSION:=1.0.0
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later

7
net/adblock-fast/files/etc/init.d/adblock-fast
View File

@ -282,7 +282,7 @@ append_url() {
echo 'dnsmasq2' echo 'dnsmasq2'
elif grep -q '^address=' "$file"; then elif grep -q '^address=' "$file"; then
echo 'dnsmasq3' echo 'dnsmasq3'
elif grep -q '^0.0.0.0' "$file" || grep -q '^127.0.0.1' "$file"; then elif grep -q '^0\.0\.0\.0' "$file" || grep -q '^127\.0\.0\.1' "$file"; then
echo 'hosts' echo 'hosts'
elif [ -n "$(sed "$domainsFilter" "$file" | head -1)" ]; then elif [ -n "$(sed "$domainsFilter" "$file" | head -1)" ]; then
echo 'domains' echo 'domains'
@ -1536,6 +1536,7 @@ adb_start() {
json_close_array json_close_array
procd_close_data procd_close_data
procd_close_instance procd_close_instance
return 0
} }
adb_status() { adb_status() {
@ -1568,12 +1569,13 @@ adb_status() {
n=$((n+1)) n=$((n+1))
done done
fi fi
return 0
} }
# shellcheck disable=SC2120 # shellcheck disable=SC2120
adb_stop() { adb_stop() {
local validation_result="$3" local validation_result="$3"
load_environment "$validation_result" 'quiet' || return 1 load_environment "$validation_result" 'quiet' || return 0
if [ -s "$outputFile" ]; then if [ -s "$outputFile" ]; then
output "Stopping $serviceName... " output "Stopping $serviceName... "
cache 'create' cache 'create'
@ -1593,6 +1595,7 @@ adb_stop() {
output "${_ERROR_}: $(get_text 'errorStopping')!\\n" output "${_ERROR_}: $(get_text 'errorStopping')!\\n"
fi fi
fi fi
return 0
} }
adb_pause() { adb_pause() {