fix env pass in sh command. closes #3196

MightyPirates · Jun 9, 2022 · c9530ae · c9530ae
1 parent 6aee1d6
commit c9530ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -41,5 +41,5 @@ if #args == 0 then
   end
 else
   -- execute command.
-  return sh.execute(...)
+  return sh.execute(_ENV, ...)
 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
@@ -10,8 +10,8 @@ function shell.execute(command, env, ...)
   if not sh then
     return false, reason
   end
-  local proc = process.load(sh, nil, nil, command)
-  local result = table.pack(process.internal.continue(proc, env, command, ...))
+  local proc = process.load(sh, env, nil, command)
+  local result = table.pack(process.internal.continue(proc, command, ...))
   if result.n == 0 then return true end
   return table.unpack(result, 1, result.n)
 end