moved the run-related functions into the fs library

This commit is contained in:
Izaya 2017-09-23 18:19:01 +10:00 committed by Izaya
parent 9def569a2a
commit 31309f3d2d
2 changed files with 21 additions and 21 deletions

View File

@ -248,3 +248,24 @@ function fs.mv(s,d)
fs.cp(s,d)
fs.rm(s)
end
function loadfile(fn)
local f=io.open(fn,"rb")
if not f then return false, "cannot read file" end
local S=f:read("*a")
f:close()
return load(S,"=("..fn..")","bt",os.genenv())
end
function run(fn,...)
local lf = loadfile(fn)
if not lf then return false, "cannot load file" end
local r = {pcall(lf,...)}
if r[1] == true then
table.remove(r,1)
end
print(table.unpack(r))
end
function srun(fn,...)
local lf = loadfile(fn)
if not lf then return false, "cannot load file" end
spawn(fn,print(pcall(lf,...)))
end

View File

@ -8,24 +8,3 @@ function shutil.genenv()
end
return et
end
function loadfile(fn)
local f=io.open(fn,"rb")
if not f then return false, "cannot read file" end
local S=f:read("*a")
f:close()
return load(S,"=("..fn..")","bt",os.genenv())
end
function run(fn,...)
local lf = loadfile(fn)
if not lf then return false, "cannot load file" end
local r = {pcall(lf,...)}
if r[1] == true then
table.remove(r,1)
end
print(table.unpack(r))
end
function srun(fn,...)
local lf = loadfile(fn)
if not lf then return false, "cannot load file" end
spawn(fn,print(pcall(lf,...)))
end