fix: override dofile to preserve Opus env (require was nil in sub-modules)
CC:Tweaked dofile loads files with _G as environment, but Opus injects require into the program's sandbox _ENV. All dofile'd modules (especially display.lua) could not see require. Also add dropperController to apps.db.
This commit is contained in:
@@ -27,6 +27,15 @@ local DROPPER_ANNOUNCE_INTERVAL = 30 -- seconds between dropper announcements
|
||||
local _baseDir = fs.getDir(shell.getRunningProgram())
|
||||
local function _path(rel) return fs.combine(_baseDir, rel) end
|
||||
|
||||
-- Override dofile to load modules into our _ENV so they inherit
|
||||
-- Opus's require/package (CC:Tweaked dofile uses _G instead).
|
||||
local _ccDofile = dofile
|
||||
local function dofile(path) -- luacheck: ignore
|
||||
local fn, err = loadfile(path, nil, _ENV)
|
||||
if fn then return fn()
|
||||
else error(err, 2) end
|
||||
end
|
||||
|
||||
local CLIENT_CONFIG_FILE = _path(".client_config")
|
||||
|
||||
-------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user