minor cleanup

This commit is contained in:
kepler155c@gmail.com
2020-05-25 21:48:37 -06:00
parent 1cce4aad03
commit a4f4f34576
5 changed files with 14 additions and 12 deletions

View File

@@ -1,3 +1,5 @@
-- https://www.lua.org/manual/5.1/manual.html#pdf-require
local function split(str, pattern)
local t = { }
local function helper(line) table.insert(t, line) return "" end
@@ -65,14 +67,14 @@ return function(env)
local sPath = string.gsub(pattern, "%?", fname)
-- TODO: if there's no shell, we should not be checking relative paths below
-- as they will resolve to root directory
if env.shell and
type(env.shell.getRunningProgram) == 'function' and
sPath:sub(1, 1) ~= "/" then
if env.shell
and type(env.shell.getRunningProgram) == 'function'
and sPath:sub(1, 1) ~= "/" then
sPath = fs.combine(fs.getDir(env.shell.getRunningProgram() or ''), sPath)
end
if fs.exists(sPath) and not fs.isDir(sPath) then
return loadfile(sPath, env)
return loadfile(fs.combine(sPath, ''), env)
end
end
end