mirrors
/
opus
mirror of https://github.com/kepler155c/opus
1
0
Fork 0
Code Issues Releases Wiki Activity

oops

This commit is contained in:
kepler155c@gmail.com 2020-06-13 20:26:17 -06:00
parent 9bf91a8762
commit 7df4a47ba0
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
sys/apps/shell.lua
View File

@ -149,26 +149,30 @@ function shell.resolveProgram(_sCommand)
_sCommand = tAliases[_sCommand]
end
local path = shell.resolve(_sCommand)
if fs.exists(path) and not fs.isDir(path) then
return path
end
if fs.exists(path .. '.lua') then
return path .. '.lua'
local function check(f)
return fs.exists(f) and not fs.isDir(f) and f
end
-- Otherwise, look on the path variable
if not _sCommand:find('/') then
for sPath in string.gmatch(PATH or '', "[^:]+") do
sPath = fs.combine(sPath, _sCommand )
if fs.exists(sPath) and not fs.isDir(sPath) then
return sPath
end
if fs.exists(sPath .. '.lua') then
return sPath .. '.lua'
local function inPath()
-- Otherwise, look on the path variable
if not _sCommand:find('/') then
for sPath in string.gmatch(PATH or '', "[^:]+") do
sPath = fs.combine(sPath, _sCommand )
if fs.exists(sPath) and not fs.isDir(sPath) then
return sPath
end
if fs.exists(sPath .. '.lua') then
return sPath .. '.lua'
end
end
end
end
return check(_sCommand)
or check(_sCommand .. '.lua')
or check(shell.resolve(_sCommand))
or check(shell.resolve(_sCommand) .. '.lua')
or inPath()
end
function shell.programs(_bIncludeHidden)