gluon-core: unify indentation in gluon/util.lua
This commit is contained in:
parent
f321af9889
commit
ca1b03b29e
@ -1,25 +1,25 @@
|
|||||||
-- Writes all lines from the file input to the file output except those starting with prefix
|
-- Writes all lines from the file input to the file output except those starting with prefix
|
||||||
-- Doesn't close the output file, but returns the file object
|
-- Doesn't close the output file, but returns the file object
|
||||||
local function do_filter_prefix(input, output, prefix)
|
local function do_filter_prefix(input, output, prefix)
|
||||||
local f = io.open(output, 'w+')
|
local f = io.open(output, 'w+')
|
||||||
local l = prefix:len()
|
local l = prefix:len()
|
||||||
|
|
||||||
for line in io.lines(input) do
|
for line in io.lines(input) do
|
||||||
if line:sub(1, l) ~= prefix then
|
if line:sub(1, l) ~= prefix then
|
||||||
f:write(line, '\n')
|
f:write(line, '\n')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
return f
|
return f
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
local function escape_args(ret, arg0, ...)
|
local function escape_args(ret, arg0, ...)
|
||||||
if not arg0 then
|
if not arg0 then
|
||||||
return ret
|
return ret
|
||||||
end
|
end
|
||||||
|
|
||||||
return escape_args(ret .. "'" .. string.gsub(arg0, "'", "'\\''") .. "' ", ...)
|
return escape_args(ret .. "'" .. string.gsub(arg0, "'", "'\\''") .. "' ", ...)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
@ -39,32 +39,32 @@ local uci = require('luci.model.uci').cursor()
|
|||||||
module 'gluon.util'
|
module 'gluon.util'
|
||||||
|
|
||||||
function exec(...)
|
function exec(...)
|
||||||
return os.execute(escape_args('', 'exec', ...))
|
return os.execute(escape_args('', 'exec', ...))
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Removes all lines starting with a prefix from a file, optionally adding a new one
|
-- Removes all lines starting with a prefix from a file, optionally adding a new one
|
||||||
function replace_prefix(file, prefix, add)
|
function replace_prefix(file, prefix, add)
|
||||||
local tmp = file .. '.tmp'
|
local tmp = file .. '.tmp'
|
||||||
local f = do_filter_prefix(file, tmp, prefix)
|
local f = do_filter_prefix(file, tmp, prefix)
|
||||||
if add then
|
if add then
|
||||||
f:write(add)
|
f:write(add)
|
||||||
end
|
end
|
||||||
f:close()
|
f:close()
|
||||||
os.rename(tmp, file)
|
os.rename(tmp, file)
|
||||||
end
|
end
|
||||||
|
|
||||||
function readline(fd)
|
function readline(fd)
|
||||||
local line = fd:read('*l')
|
local line = fd:read('*l')
|
||||||
fd:close()
|
fd:close()
|
||||||
return line
|
return line
|
||||||
end
|
end
|
||||||
|
|
||||||
function lock(file)
|
function lock(file)
|
||||||
exec('lock', file)
|
exec('lock', file)
|
||||||
end
|
end
|
||||||
|
|
||||||
function unlock(file)
|
function unlock(file)
|
||||||
exec('lock', '-u', file)
|
exec('lock', '-u', file)
|
||||||
end
|
end
|
||||||
|
|
||||||
function node_id()
|
function node_id()
|
||||||
|
Loading…
Reference in New Issue
Block a user