openwrt-mirror/routing
1
0
Fork 0
mirror of https://github.com/openwrt/routing.git synced 2025-12-21 23:34:32 +04:00
Code Issues Packages Projects Releases Wiki Activity

[luci-app-bmx6] When drawing the network topology graph, try first wget-ssl

Browse Source 
Signed-off-by: Pau Escrich <p4u@dabax.net>
This commit is contained in:
Pau Escrich
2016-02-23 12:58:32 +01:00
parent d7701f4ada
commit 4830444a7c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
luci-app-bmx6/files/usr/lib/lua/luci/model/bmx6json.lua
View File

@@ -112,12 +112,16 @@ function wget(url, timeout)
if pid == 0 then if pid == 0 then
rfd:close() rfd:close()
nixio.dup(wfd, nixio.stdout) nixio.dup(wfd, nixio.stdout)
-- candidates for wget, try first ones with SSL support
local candidates = { "/usr/bin/wget", "/bin/wget" } local candidates = {{"/usr/bin/wget-ssl",1},{"/usr/bin/wget",0},{"/bin/wget",0}}
local _, bin local _, bin
for _, bin in ipairs(candidates) do for _, bin in ipairs(candidates) do
if nixiofs.access(bin, "x") then if nixiofs.access(bin[1], "x") then
nixio.exec(bin, "-q", "-O", "-", url) if bin[2] == 0 then
nixio.exec(bin[1], "-q", "-O", "-", url)
else
nixio.exec(bin[1], "--no-check-certificate", "-q", "-O", "-", url)
end
end end
end end
return return