|
|
@@ -1,4 +1,5 @@ |
|
|
|
local serial = require "serialization" |
|
|
|
local event = require "event" |
|
|
|
print(pcall(function() |
|
|
|
local shenv = {} |
|
|
|
function shenv.quit() |
|
|
@@ -21,21 +22,14 @@ setmetatable(shenv,{__index=function(_,k) |
|
|
|
if _G[k] then |
|
|
|
return _G[k] |
|
|
|
elseif fp then |
|
|
|
local rqid = string.format("shell-%d",math.random(1,99999)) |
|
|
|
return function(...) |
|
|
|
local tA = {...} |
|
|
|
local pid = os.spawn(function() computer.pushSignal(rqid,pcall(loadfile(fp),table.unpack(tA))) end,fp) |
|
|
|
local tE = {} |
|
|
|
repeat |
|
|
|
tE = {coroutine.yield()} |
|
|
|
if tE[1] == rqid then |
|
|
|
table.remove(tE,1) |
|
|
|
if tE[1] == true then |
|
|
|
table.remove(tE,1) |
|
|
|
end |
|
|
|
return table.unpack(tE) |
|
|
|
end |
|
|
|
until not os.taskInfo(pid) |
|
|
|
local pid = os.spawnfile(fp,fp,table.unpack(tA)) |
|
|
|
local tE = event.pull("process_finished",pid) |
|
|
|
if tE[1] == true then |
|
|
|
table.remove(tE,1) |
|
|
|
end |
|
|
|
return table.unpack(tE) |
|
|
|
end |
|
|
|
end |
|
|
|
end}) |
|
|
@@ -51,7 +45,7 @@ while os.getenv("run") do |
|
|
|
if tResult[1] == true then table.remove(tResult,1) end |
|
|
|
for k,v in pairs(tResult) do |
|
|
|
if type(v) == "table" then |
|
|
|
print(serial.serialize(v)) |
|
|
|
print(serial.serialize(v,true)) |
|
|
|
else |
|
|
|
print(v) |
|
|
|
end |
|
|
|