From d047067c1f53f8941470b6d695ff0a78fa38c83d Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 31 Jan 2025 15:19:45 +0100 Subject: [PATCH] Fix apk check in openmptcprouter wizard interface --- .../luasrc/view/openmptcprouter/wizard.htm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm index cea83f0e1..3dd59b5a7 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wizard.htm @@ -10,13 +10,15 @@ local ifaces = sys.net:devices() local ifttyu = nixio.fs.glob("/dev/ttyUSB*") local ifttyc = nixio.fs.glob("/dev/cdc-wdm*") - local sqm = luci.sys.exec("opkg list-installed | grep -q luci-app-sqm && echo -n '1' || echo -n '0'") - if sqm == "0" then - sqm = luci.sys.exec("apk list | grep installed | grep -q luci-app-sqm && echo -n '1' || echo -n '0'") + if nixio.fs.stat('/usr/bin/apk', 'type') == 'reg' then + sqm = luci.sys.exec("apk list 2>/dev/null | grep installed | grep -q luci-app-sqm && echo -n '1' || echo -n '0'") + else + sqm = luci.sys.exec("opkg list-installed | grep -q luci-app-sqm && echo -n '1' || echo -n '0'") end - local qos = luci.sys.exec("opkg list-installed | grep -q luci-app-qos && echo -n '1' || echo -n '0'") - if qos == "0" then - qos = luci.sys.exec("apk list | grep installed | grep -q luci-app-qos && echo -n '1' || echo -n '0'") + if nixio.fs.stat('/usr/bin/apk', 'type') == 'reg' then + qos = luci.sys.exec("apk list 2>/dev/null | grep installed | grep -q luci-app-qos && echo -n '1' || echo -n '0'") + else + qos = luci.sys.exec("opkg list-installed | grep -q luci-app-qos && echo -n '1' || echo -n '0'") end menuentry = uci:get("openmptcprouter","settings","menu") or "openmptcprouter" function device_notvirtual(dev)