mirror of https://github.com/kepler155c/opus
path fix + compat changes
This commit is contained in:
parent
09be81be27
commit
30b7199976
|
@ -139,7 +139,7 @@ end
|
|||
term.clear()
|
||||
term.setCursorPos(1, 1)
|
||||
if bootOptions[bootOption].args then
|
||||
os.run({}, table.unpack(bootOptions[bootOption].args))
|
||||
os.run(_ENV, table.unpack(bootOptions[bootOption].args))
|
||||
else
|
||||
print(bootOptions[bootOption].prompt)
|
||||
end
|
||||
|
|
|
@ -19,7 +19,7 @@ end
|
|||
if not fs.exists('usr/config/shell') then
|
||||
Util.writeTable('usr/config/shell', {
|
||||
aliases = shell.aliases(),
|
||||
path = 'usr/apps',
|
||||
path = '/usr/apps',
|
||||
lua_path = package.path,
|
||||
upgraded = 1,
|
||||
})
|
||||
|
@ -36,7 +36,7 @@ if config.aliases then
|
|||
end
|
||||
|
||||
local path = config.path and Util.split(config.path, '(.-):') or { }
|
||||
table.insert(path, 'sys/apps')
|
||||
table.insert(path, '/sys/apps')
|
||||
for _, v in pairs(Util.split(shell.path(), '(.-):')) do
|
||||
table.insert(path, v)
|
||||
end
|
||||
|
|
|
@ -13,7 +13,7 @@ table.insert(helpPaths, '/sys/help')
|
|||
for name in pairs(Packages:installed()) do
|
||||
local packageDir = fs.combine('packages', name)
|
||||
|
||||
table.insert(appPaths, 1, packageDir)
|
||||
table.insert(appPaths, 1, '/' .. packageDir)
|
||||
local apiPath = fs.combine(packageDir, 'apis')
|
||||
if fs.exists(apiPath) then
|
||||
fs.mount(fs.combine('rom/modules/main', name), 'linkfs', apiPath)
|
||||
|
|
|
@ -490,7 +490,7 @@ function Util.loadTable(fname)
|
|||
if not fc then
|
||||
return false, 'Unable to read file'
|
||||
end
|
||||
local s, m = load('return ' .. fc, fname)
|
||||
local s, m = loadstring('return ' .. fc, fname)
|
||||
if s then
|
||||
s, m = pcall(s)
|
||||
if s then
|
||||
|
@ -551,9 +551,8 @@ function Util.run(env, path, ...)
|
|||
end
|
||||
|
||||
function Util.runFunction(env, fn, ...)
|
||||
--setfenv(fn, env)
|
||||
setfenv(fn, env)
|
||||
setmetatable(env, { __index = _G })
|
||||
fn = load(fn,"util.runfunction",nil,env)
|
||||
return pcall(fn, ...)
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue