From 102aec7b691bfaaffe344876978540ad0d715845 Mon Sep 17 00:00:00 2001 From: payonel Date: Sat, 3 Sep 2022 13:45:50 -0700 Subject: [PATCH] Revert support for /bin/sh command... as it causes various env issues. will not support #3196 at this time --- .../resources/assets/opencomputers/loot/openos/bin/sh.lua | 2 +- .../assets/opencomputers/loot/openos/lib/core/full_shell.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/opencomputers/loot/openos/bin/sh.lua b/src/main/resources/assets/opencomputers/loot/openos/bin/sh.lua index de7a7b1c41..d4e4dd9db7 100644 --- a/src/main/resources/assets/opencomputers/loot/openos/bin/sh.lua +++ b/src/main/resources/assets/opencomputers/loot/openos/bin/sh.lua @@ -41,5 +41,5 @@ if #args == 0 then end else -- execute command. - return sh.execute(_ENV, ...) + return sh.execute(...) end diff --git a/src/main/resources/assets/opencomputers/loot/openos/lib/core/full_shell.lua b/src/main/resources/assets/opencomputers/loot/openos/lib/core/full_shell.lua index 7c6701715d..2576b07ee8 100644 --- a/src/main/resources/assets/opencomputers/loot/openos/lib/core/full_shell.lua +++ b/src/main/resources/assets/opencomputers/loot/openos/lib/core/full_shell.lua @@ -10,8 +10,8 @@ function shell.execute(command, env, ...) if not sh then return false, reason end - local proc = process.load(sh, env, nil, command) - local result = table.pack(process.internal.continue(proc, command, ...)) + local proc = process.load(sh, nil, nil, command) + local result = table.pack(process.internal.continue(proc, env, command, ...)) if result.n == 0 then return true end return table.unpack(result, 1, result.n) end