AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-19 12:17:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'patch-2' of https://github.com/istasi/OpenComputers

Browse Source
This commit is contained in:
Florian Nücke 2014-07-05 13:46:54 +02:00
commit e4ebcbb6a4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/assets/opencomputers/loot/OpenOS/bin/sh.lua
View File

@ -118,7 +118,9 @@ local function execute(env, command, ...)
local thread, reason = process.load(shell.resolve(program, "lua"), env, nil, command)
if not thread then
return false, reason
end
else
os.setenv ( '_', shell.resolve (program, "lua") )
end
local result = nil
-- Emulate CC behavior by making yields a filtered event.pull()
while args[1] and coroutine.status(thread) ~= "dead" do
@ -189,4 +191,4 @@ else
error(result[2], 0)
end
return table.unpack(result, 2)
end
end