From 4dc98fefcac468917227bd9037bf6a71cbed9b67 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Mon, 24 Oct 2022 17:18:43 +0000 Subject: [PATCH] luci-app-simple-adblock: bugfix: identify nft set support Signed-off-by: Stan Grishin --- applications/luci-app-simple-adblock/Makefile | 2 +- .../luasrc/model/cbi/simple-adblock.lua | 6 +++--- .../luci-app-simple-adblock/po/templates/simple-adblock.pot | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile index 9144c9a252..93779c2fec 100644 --- a/applications/luci-app-simple-adblock/Makefile +++ b/applications/luci-app-simple-adblock/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_LICENSE:=GPL-3.0-or-later PKG_MAINTAINER:=Stan Grishin -PKG_VERSION:=1.9.0-1 +PKG_VERSION:=1.9.2-3 LUCI_TITLE:=Simple Adblock Web UI LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service. diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua index 00674ab267..ec047420a8 100644 --- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua +++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua @@ -52,7 +52,7 @@ function checkIpset() end function checkNftset() - if sys.call("command -v nft") == 0 then + if sys.call("command -v nft >/dev/null 2>&1") == 0 then return true else return false @@ -319,10 +319,10 @@ if checkDnsmasq() then dns:value("dnsmasq.addnhosts", translate("DNSMASQ Additional Hosts")) dns:value("dnsmasq.conf", translate("DNSMASQ Config")) if checkDnsmasqIpset() then - dns:value("dnsmasq.ipset", translate("DNSMASQ IP Set")) + dns:value("dnsmasq.ipset", translate("DNSMASQ Ipset")) end if checkDnsmasqNftset() then - dns:value("dnsmasq.nftset", translate("DNSMASQ NFT Set")) + dns:value("dnsmasq.nftset", translate("DNSMASQ Nft Set")) end dns:value("dnsmasq.servers", translate("DNSMASQ Servers File")) end diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot index 21241353f0..6244cb15fd 100644 --- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot +++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot @@ -103,11 +103,11 @@ msgid "DNSMASQ Config" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:322 -msgid "DNSMASQ IP Set" +msgid "DNSMASQ Ipset" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:325 -msgid "DNSMASQ NFT Set" +msgid "DNSMASQ Nft Set" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:327 @@ -289,7 +289,6 @@ msgid "Service Status [%s %s]" msgstr "" #: applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua:4 -#: applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json:3 msgid "Simple AdBlock" msgstr "" -- 2.30.2