mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-18 11:48:02 -04:00
Merge branch 'OC1.3-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10
This commit is contained in:
commit
4f9ac09f04
@ -11,7 +11,11 @@ local aliases = {}
|
|||||||
local shells = setmetatable({}, {__mode="v"})
|
local shells = setmetatable({}, {__mode="v"})
|
||||||
|
|
||||||
local function getShell()
|
local function getShell()
|
||||||
local shellName = shell.resolve(os.getenv("SHELL"), "lua")
|
local shellPath = os.getenv("SHELL") or "/bin/sh"
|
||||||
|
local shellName, reason = shell.resolve(shellPath, "lua")
|
||||||
|
if not shellName then
|
||||||
|
return nil, "cannot resolve shell `" .. shellPath .. "': " .. reason
|
||||||
|
end
|
||||||
if shells[shellName] then
|
if shells[shellName] then
|
||||||
return shells[shellName]
|
return shells[shellName]
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user