From badad3ef881e766ec9eaa39aa75a1a3365e3f0d2 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 30 Sep 2020 20:32:07 +0800 Subject: [PATCH] luci-app-adguardhome: fix read core version Co-authored-by: dogbutcat --- .../luasrc/model/cbi/AdGuardHome/base.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua b/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua index 9e5f001620..a5e8c3aa39 100644 --- a/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua +++ b/package/ctcgfw/luci-app-adguardhome/luasrc/model/cbi/AdGuardHome/base.lua @@ -37,8 +37,8 @@ else local version=uci:get("AdGuardHome","AdGuardHome","version") local testtime=fs.stat(binpath,"mtime") if testtime~=tonumber(binmtime) or version==nil then - local tmp=luci.sys.exec(binpath.." -c /dev/null --check-config 2>&1| grep -m 1 -E '(version |v)[0-9.]+' -o") - version=string.sub(tmp, -7) + local tmp=luci.sys.exec(binpath.." --version | grep -m 1 -E ' [0-9.]+' -o ") + version=string.sub(tmp, 1) if version=="" then version="core error" end uci:set("AdGuardHome","AdGuardHome","version",version) uci:set("AdGuardHome","AdGuardHome","binmtime",testtime)