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

Fix #48 (shell resolving issue) 

42bd4b2 seemingly introduced a bug where programs would not be run from
the shell even if they were in the current directory (for example, the
program `test/x.lua` would not run if you typed `x` while in the `test`
directory). This fixes that by moving the `return inPath()` part into
the big `return` statement at the end of `shell.resolvePath`.
This commit is contained in:
Kan18 2022-06-29 21:46:20 -04:00
parent 7c5f749f02
commit 027bc5d128
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/apps/shell.lua
View File

@ -173,15 +173,12 @@ function shell.resolveProgram(_sCommand)
end
end
if not _sCommand:find('/') then
return inPath()
end
-- so... even if you are in the rom directory and you run:
-- 'packages/common/edit.lua', allow this even though it
-- does not use a leading slash. Ideally, fs.combine would
-- provide the leading slash... but it does not.
return check(shell.resolve(_sCommand))
return (not _sCommand:find('/')) and inPath()
or check(shell.resolve(_sCommand))
or check(shell.resolve(_sCommand) .. '.lua')
or check(_sCommand)
or check(_sCommand .. '.lua')