vrr/ntopng
2
0
Fork 0
mirror of https://github.com/ntop/ntopng.git synced 2026-04-29 07:29:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Updates ntopctl to handle service n2disk-ntopng

Browse source
This commit is contained in:
Simone Mainardi 2019-01-02 15:49:16 +01:00
parent 11a99722e0
commit fcc66a4b05
4 changed files with 48 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scripts/lua/modules/os_utils.lua
View file

@ -14,7 +14,7 @@ local is_windows = ntop.isWindows()
-- ########################################################
function os_utils.getPathDivider()
if(ntop.isWindows()) then
if(is_windows) then
return "\\"
else
return "/"
@ -27,7 +27,7 @@ end
function os_utils.fixPath(path)
path = string.gsub(path, "//+", '/') -- removes possibly empty parts of the path
if(ntop.isWindows() and (string.len(path) > 2)) then
if(is_windows and (string.len(path) > 2)) then
path = string.gsub(path, "/", os_utils.getPathDivider())
end
@ -88,7 +88,7 @@ function os_utils.hasService(service_name, ...)
return false
end
local has_ntopctl = os_utils.execWithOutput("which ntopctl >/dev/null 2>/dev/null")
local has_ntopctl = os_utils.execWithOutput("which ntopctl >/dev/null 2>&1")
if has_ntopctl == nil then
-- ntopctl is not available
return false