From 97c4b7a090e3068d59566e44054e6019ab8c1e71 Mon Sep 17 00:00:00 2001 From: "kepler155c@gmail.com" Date: Sun, 21 Oct 2018 04:46:40 -0400 Subject: [PATCH] package manager wip --- sys/apis/config.lua | 5 ++++- sys/extensions/6.packages.lua | 7 +++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/apis/config.lua b/sys/apis/config.lua index 52ce0c0..20f4e86 100644 --- a/sys/apis/config.lua +++ b/sys/apis/config.lua @@ -15,7 +15,10 @@ function Config.load(fname, data) if not fs.exists(filename) then Util.writeTable(filename, data) else - Util.merge(data, Util.readTable(filename) or { }) + local contents = Util.readTable(filename) or + error('Configuration file is corrupt:' .. filename) + + Util.merge(data, contents) end end diff --git a/sys/extensions/6.packages.lua b/sys/extensions/6.packages.lua index 09fcaff..3f46c7e 100644 --- a/sys/extensions/6.packages.lua +++ b/sys/extensions/6.packages.lua @@ -30,8 +30,11 @@ for name, package in pairs(Packages:installed()) do fs.mount(table.unpack(Util.matches(package.mount))) end - addPath(appPaths, fs.combine(fs.combine('packages', name), 'apps')) - addPath(luaPaths, fs.combine(fs.combine('packages', name), 'apis')) + addPath(appPaths, fs.combine('packages', name)) + local apiPath = fs.combine(fs.combine('packages', name), 'apis') + if fs.exists(apiPath) then + addPath(luaPaths, apiPath) + end end shell.setPath(table.concat(appPaths, ':'))