izaya/OC-PsychOS2
1
1
Fork 0
mirror of https://git.shadowkat.net/izaya/OC-PsychOS2.git synced 2024-11-22 12:04:20 -05:00
Code Issues Releases Wiki Activity

Compare commits

base: izaya:5e9baee9fa265ace952bcb93366947c1a7037b8c
Branches Tags
izaya:master
..
compare: izaya:be3d3c207fd7a433c99db67337eed42049154a7f
Branches Tags
izaya:master

2 Commits
5e9baee9fa ... be3d3c207f

Author SHA1 Message Date
XeonSquared
be3d3c207f rewrote require() to support package.path and submodules 2020-06-25 17:19:50 +10:00
XeonSquared
522d456433 add basic submodule support to require 2020-06-25 16:29:12 +10:00
1 changed files with 7 additions and 6 deletions
Show Stats Expand all files Collapse all files

13
module/loadfile.lua
View File

@ -12,15 +12,16 @@ function os.spawnfile(p,n,...) -- string string -- number -- spawns a new proces
return os.spawn(function() local res={pcall(loadfile(p), table.unpack(tA))} computer.pushSignal("process_finished", os.pid(), table.unpack(res)) dprint(table.concat(res)) end,n or p) return os.spawn(function() local res={pcall(loadfile(p), table.unpack(tA))} computer.pushSignal("process_finished", os.pid(), table.unpack(res)) dprint(table.concat(res)) end,n or p)
end end
_G.package = {} _G.package = {}
package.path="./?;./?.lua;/boot/lib/?.lua;/pkg/lib/?.lua;/boot/lib/?/init.lua;/pkg/lib/?/init.lua"
package.loaded = {computer=computer,component=component,fs=fs,buffer=buffer} package.loaded = {computer=computer,component=component,fs=fs,buffer=buffer}
function require(f,force) -- string boolean -- table -- searches for a library with name *f* and returns what the library returns, if possible. if *force* is set, loads the library even if it is cached function require(f,force) -- string boolean -- table -- searches for a library with name *f* and returns what the library returns, if possible. if *force* is set, loads the library even if it is cached
if not package.loaded[f] or force then if not package.loaded[f] or force then
local lib = os.getenv("LIB") or "/boot/lib\n/pkg/lib" local ln = f:gsub("%.","/")
for d in lib:gmatch("[^\n]+") do for d in package.path:gmatch("[^;]+") do
if fs.exists(d.."/"..f) then local p = d:gsub("%?",ln)
package.loaded[f] = runfile(d.."/"..f) if fs.exists(p) and not fs.isDirectory(p) then
elseif fs.exists(d.."/"..f..".lua") then package.loaded[f] = runfile(p)
package.loaded[f] = runfile(d.."/"..f..".lua") break
end end
end end
end end