From: Thiago de Arruda Padilha <redacted>
Date: Wed, 23 Dec 2020 18:17:17 +0000 (-0300)
Subject: adblock: fix when PROCD_RELOAD_DELAY is set
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=864092e073a19c60f8210413c2182b63d6676811;p=openwrt-packages.git

adblock: fix when PROCD_RELOAD_DELAY is set

Move the "PROCD_RELOAD_DELAY" line to after the "delay" variable is set.

Signed-off-by: Thiago de Arruda Padilha <redacted>
---

diff --git a/net/adblock/Makefile b/net/adblock/Makefile
index f25ac5749..81be42b7e 100644
--- a/net/adblock/Makefile
+++ b/net/adblock/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=adblock
 PKG_VERSION:=4.0.8
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICENSE:=GPL-3.0-or-later
 PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
 
diff --git a/net/adblock/files/adblock.init b/net/adblock/files/adblock.init
index c75ddee67..0aa219d44 100755
--- a/net/adblock/files/adblock.init
+++ b/net/adblock/files/adblock.init
@@ -246,10 +246,10 @@ service_triggers()
 {
 	local trigger delay type
 
-	PROCD_RELOAD_DELAY=$((delay*1000))
 	trigger="$(uci_get adblock global adb_trigger)"
 	delay="$(uci_get adblock global adb_triggerdelay "2")"
 	type="$(uci_get adblock global adb_starttype "start")"
+	PROCD_RELOAD_DELAY=$((delay*1000))
 	if [ -n "${trigger}" ]
 	then
 		procd_add_interface_trigger "interface.*.up" "${trigger}" "${adb_init}" "${type}"