diff options
| author | Stan <stangri@melmac.net> | 2020-09-21 11:41:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-21 11:41:40 -0700 |
| commit | 3348009c7054dd97fbabe27daa1f1cb8b783e5b7 (patch) | |
| tree | a5801e80b8f9c15f48ae0c4f271863fa55facb76 /applications/luci-app-vpnbypass/luasrc/model | |
| parent | 482e367e022bf4de8dbe866661d2220de1f2a28c (diff) | |
| parent | 053e3952f02319ae5e0d8668cf67ce8c4a8c7f6d (diff) | |
Merge pull request #4457 from stangri/master-luci-app-vpnbypass
luci-app-vpnbypass: ACL-related update
Diffstat (limited to 'applications/luci-app-vpnbypass/luasrc/model')
| -rw-r--r-- | applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua index 8a70bd1bb9..ed9599c90e 100644 --- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua +++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua @@ -4,8 +4,22 @@ local sys = require "luci.sys" local util = require "luci.util" local packageName = "vpnbypass" -local packageVersion, statusText = nil, nil -packageVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'"))) or "" +function getPackageVersion() + local opkgFile = "/usr/lib/opkg/status" + local line + local flag = false + for line in io.lines(opkgFile) do + if flag then + return line:match('[%d%.$-]+') or "" + elseif line:find("Package: " .. packageName:gsub("%-", "%%%-")) then + flag = true + end + end + return "" +end + +local packageVersion = getPackageVersion() +local statusText = nil if packageVersion == "" then statusText = translatef("%s is not installed or not found", packageName) end |