From 6ad21c7832b341eff15a744bae369e295b3cbedb Mon Sep 17 00:00:00 2001 From: XeonSquared Date: Thu, 19 Dec 2019 16:14:48 +1100 Subject: [PATCH] made require pull from a shared library pool --- module/loadfile.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/module/loadfile.lua b/module/loadfile.lua index b572cb2..5c73784 100644 --- a/module/loadfile.lua +++ b/module/loadfile.lua @@ -11,14 +11,19 @@ function os.spawnfile(p,n,...) -- spawns a new process from file *p* with name * local tA = {...} return os.spawn(function() computer.pushSignal("process_finished", os.pid(), pcall(loadfile(p), table.unpack(tA))) end,n or p) end +_G.libs = {computer=computer,component=component} function require(f) -- searches for a library with name *f* and returns what the library returns, if possible local lib = os.getenv("LIB") or "/boot/lib" for d in lib:gmatch("[^\n]+") do if fs.exists(d.."/"..f) then - return runfile(d.."/"..f) + _G.libs[f] = runfile(d.."/"..f) elseif fs.exists(d.."/"..f..".lua") then - return runfile(d.."/"..f..".lua") + _G.libs[f] = runfile(d.."/"..f..".lua") end end - error("library not found: "..f) + if _G.libs[f] then + return _G.libs[f] + else + error("library not found: "..f) + end end