mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-12 03:00:30 +00:00
Code Issues Releases Wiki Activity

Set the arg table within shell.run

Browse Source 
This makes us a little more compatible with Lua
This commit is contained in:
SquidDev 2019-05-24 18:42:19 +01:00
parent 68bf3a71dc
commit d661cfa88b
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/assets/computercraft/lua/rom/programs/shell.lua
View File

@ -130,8 +130,12 @@ local function run( _sCommand, ... )
end
multishell.setTitle( multishell.getCurrent(), sTitle )
end
local sDir = fs.getDir( sPath )
local result = os.run( createShellEnv( sDir ), sPath, ... )
local env = createShellEnv( sDir )
env[ "arg" ] = { [0] = _sCommand, ... }
local result = os.run( env, sPath, ... )
tProgramStack[#tProgramStack] = nil
if multishell then
if #tProgramStack > 0 then

17
src/test/resources/test-rom/spec/programs/shell_spec.lua Normal file
View File

@ -0,0 +1,17 @@
describe("The shell", function()
describe("shell.run", function()
it("sets the arguments", function()
local handle = fs.open("test-files/out.txt", "w")
handle.writeLine("_G.__arg = arg")
handle.close()
shell.run("/test-files/out.txt", "arg1", "arg2")
fs.delete("test-files/out.txt")
local args = _G.__arg
_G.__arg = nil
expect(args):same { [0] = "/test-files/out.txt", "arg1", "arg2" }
end)
end)
end)