Develop 1.8 #20

Merged
Kan18 merged 242 commits from develop-1.8 into master-1.8 2019-11-10 20:52:08 -05:00
3 changed files with 3 additions and 6 deletions
Showing only changes of commit 0b326589c2 - Show all commits

View File

@@ -128,13 +128,10 @@ local function loadApplications()
applications = Util.readTable('sys/etc/app.db')
for dir in pairs(Packages:installed()) do
local path = fs.combine('packages/' .. dir, 'etc/apps')
local path = fs.combine('packages/' .. dir, 'etc/apps.db')
if fs.exists(path) then
local dbs = fs.list(path)
for _, db in pairs(dbs) do
local apps = Util.readTable(fs.combine(path, db)) or { }
Util.merge(applications, apps)
end
local apps = Util.readTable(path) or { }
Util.merge(applications, apps)
end
end