mirror of
https://github.com/kepler155c/opus
synced 2024-10-31 22:26:16 +00:00
816ea366ab
This commit fixes the TLCO boot option (which hasn't been working for a while now), and also changes boot file extensions from .boot to .lua.
59 lines
1.3 KiB
Lua
59 lines
1.3 KiB
Lua
local fs = _G.fs
|
|
|
|
-- override bios function to use the global scope of the current env
|
|
function _G.loadstring(string, chunkname)
|
|
return load(string, chunkname, nil, getfenv(2)._G)
|
|
end
|
|
|
|
-- override bios function to include the actual filename
|
|
function _G.loadfile(filename, mode, env)
|
|
-- Support the previous `loadfile(filename, env)` form instead.
|
|
if type(mode) == "table" and env == nil then
|
|
mode, env = nil, mode
|
|
end
|
|
|
|
local file = fs.open(filename, "r")
|
|
if not file then return nil, "File not found" end
|
|
|
|
local func, err = load(file.readAll(), '@' .. filename, mode, env)
|
|
file.close()
|
|
return func, err
|
|
end
|
|
|
|
local sandboxEnv = setmetatable({ }, { __index = _G })
|
|
for k,v in pairs(_ENV) do
|
|
sandboxEnv[k] = v
|
|
end
|
|
|
|
-- Install require shim
|
|
_G.requireInjector = loadfile('sys/modules/opus/injector.lua', _ENV)()
|
|
|
|
local function run(file, ...)
|
|
local env = setmetatable({ }, { __index = _G })
|
|
for k,v in pairs(sandboxEnv) do
|
|
env[k] = v
|
|
end
|
|
|
|
_G.requireInjector(env)
|
|
|
|
local s, m = loadfile(file, env)
|
|
if s then
|
|
return s(...)
|
|
end
|
|
error('Error loading ' .. file .. '\n' .. m)
|
|
end
|
|
|
|
_G._syslog = function() end
|
|
_G.OPUS_BRANCH = 'develop-1.8'
|
|
|
|
local s, m = pcall(run, 'sys/apps/shell.lua', 'sys/kernel.lua', ...)
|
|
|
|
if not s then
|
|
print('\nError loading Opus OS\n')
|
|
_G.printError(m .. '\n')
|
|
end
|
|
|
|
if fs.restore then
|
|
fs.restore()
|
|
end
|