mirrors/opus
1
0
Fork 0
mirror of https://github.com/kepler155c/opus synced 2025-10-14 07:17:40 +00:00
Code Issues Releases Wiki Activity

require rework round 3

Browse Source
This commit is contained in:
kepler155c@gmail.com
2019-01-26 22:58:02 -05:00
parent 496e95a6c4
commit b320c92551
4 changed files with 24 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sys/extensions/4.user.lua
View File

@@ -44,6 +44,8 @@ for _, v in pairs(Util.split(shell.path(), '(.-):')) do
end
shell.setPath(table.concat(path, ':'))
_G.LUA_PATH = config.lua_path
-- TODO: replace when stable (old lua path is now incorrect)
-- _G.LUA_PATH = config.lua_path
_G.LUA_PATH = package.path
fs.loadTab('usr/config/fstab')

8
sys/extensions/6.packages.lua
View File

@@ -24,12 +24,6 @@ local function addEntry(t, e, n)
table.insert(t, n or 1, e)
end
local function addRequirePath(t, path)
addEntry(t, string.format('/%s/?/init.lua', path), 7)
addEntry(t, string.format('/%s/?.lua', path), 7)
addEntry(t, string.format('/%s/?', path), 7)
end
for name in pairs(Packages:installed()) do
local packageDir = fs.combine('packages', name)
if fs.exists(fs.combine(packageDir, '.install')) then
@@ -42,7 +36,7 @@ for name in pairs(Packages:installed()) do
addEntry(appPaths, packageDir)
local apiPath = fs.combine(fs.combine('packages', name), 'apis')
if fs.exists(apiPath) then
addRequirePath(luaPaths, apiPath)
fs.mount(fs.combine('sys/apis', name), 'linkfs', apiPath)
end
local helpPath = '/' .. fs.combine(fs.combine('packages', name), 'help')