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

Merge branch 'OC1.3-MC1.6.4' of github.com:MightyPirates/OpenComputers into OC1.3-MC1.7.10

Browse Source
This commit is contained in:
Florian Nücke 2014-08-06 13:30:09 +02:00
commit c5c58bf9d0
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/resources/assets/opencomputers/loot/OpenOS/lib/shell.lua
View File

@ -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