summaryrefslogtreecommitdiff
path: root/net/simple-adblock/files/simple-adblock.init
diff options
context:
space:
mode:
Diffstat (limited to 'net/simple-adblock/files/simple-adblock.init')
-rw-r--r--net/simple-adblock/files/simple-adblock.init22
1 files changed, 15 insertions, 7 deletions
diff --git a/net/simple-adblock/files/simple-adblock.init b/net/simple-adblock/files/simple-adblock.init
index ba2a597e8..4c7486d51 100644
--- a/net/simple-adblock/files/simple-adblock.init
+++ b/net/simple-adblock/files/simple-adblock.init
@@ -9,13 +9,21 @@ START=94
USE_PROCD=1
LC_ALL=C
+if type extra_command 1>/dev/null 2>&1; then
+ extra_command 'check' 'Checks if specified domain is found in current block-list'
+ extra_command 'dl' 'Force-downloads all enabled block-list'
+ extra_command 'sizes' 'Displays the file-sizes of enabled block-listo'
+ extra_command 'show' 'Shows the service last-run status'
+ extra_command 'version' 'Show version information'
+else
# shellcheck disable=SC2034
-EXTRA_COMMANDS='check dl killcache sizes show version'
+ EXTRA_COMMANDS='check dl killcache sizes show version'
# shellcheck disable=SC2034
-EXTRA_HELP=' check Checks if specified domain is found in current block-list
+ EXTRA_HELP=' check Checks if specified domain is found in current block-list
dl Force-downloads all enabled block-list
sizes Displays the file-sizes of enabled block-lists
show Shows the service last-run status'
+fi
readonly packageName='simple-adblock'
readonly serviceName="$packageName $PKG_VERSION"
@@ -742,13 +750,13 @@ process_config_update() {
output 2 "[DL] Config Update: $label $__FAIL__\\n"
tmpfs add error "errorDownloadingConfigUpdate"
else
- if ! sed -f "$R_TMP" -i /etc/config/simple-adblock; then
+ if [ -s "$R_TMP" ] && sed -f "$R_TMP" -i /etc/config/simple-adblock; then
+ output 1 "$_OK_"
+ output 2 "[DL] Config Update: $label $__OK__\\n"
+ else
output 1 "$_FAIL_"
output 2 "[DL] Config Update: $label $__FAIL__\\n"
tmpfs add error "errorParsingConfigUpdate"
- else
- output 1 "$_OK_"
- output 2 "[DL] Config Update: $label $__OK__\\n"
fi
fi
rm -f "$R_TMP"
@@ -1214,7 +1222,7 @@ stop_service() {
}
service_triggers() {
- procd_add_reload_trigger 'simple-adblock'
+ procd_add_config_trigger "config.change" "$packageName" /etc/init.d/$packageName reload
}
check() {