izaya/OC-PsychOS2
1
0
Fork 4
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: izaya:6c4518011906b8b2025de0dbc6b592915ee4f8db
Branches Tags
izaya:master
...
compare: izaya:be8ba0a40bc7dcee7c2d5c028669e2594dc0b57a
Branches Tags
izaya:master

2 Commits
6c45180119 ... be8ba0a40b

Author SHA1 Message Date
XeonSquared
be8ba0a40b made the shell not return pcall's true if it is true 2019-07-28 19:52:32 +10:00
XeonSquared
7347c93988 made external executables return despite being in a different process. yay for IPC? 2019-07-28 19:46:43 +10:00
1 changed files with 11 additions and 2 deletions
Show Stats Expand all files Collapse all files

13
exec/shell.lua
View File

@ -26,11 +26,20 @@ setmetatable(shenv,{__index=function(_,k)
if _G[k] then
return _G[k]
elseif fs.exists("/boot/exec/"..k..".lua") then
local rqid = string.format("shell-%d",math.random(1,99999))
return function(...)
local tA = {...}
local pid = os.spawn(function() loadfile("/boot/exec/"..k..".lua")(table.unpack(tA)) end,"/boot/exec/"..k..".lua")
local pid = os.spawn(function() computer.pushSignal(rqid,pcall(loadfile("/boot/exec/"..k..".lua"),table.unpack(tA))) end,"/boot/exec/"..k..".lua")
local tE = {}
repeat
coroutine.yield()
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 tTasks[pid] == nil
end
end