sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Load default config file is none is provided

This commit is contained in:
Jérôme Leclercq 2020-08-27 19:49:34 +02:00
parent c8e74b6196
commit 91291fd91c
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
build/config.lua.default.lua → build/config.lua.default
View File

24
build/scripts/common.lua
View File

@ -497,23 +497,33 @@ function NazaraBuild:Initialize()
end
end
function NazaraBuild:LoadConfig()
local f = io.open("config.lua", "r")
function NazaraBuild:LoadConfigFile(path, configTable)
local f = io.open(path, "r")
if (f) then
local content = f:read("*a")
f:close()
local func, err = load(content, "Config file", "t", self.Config)
local func, err = load(content, "Config file", "t", configTable)
if (func) then
local status, err = pcall(func)
if (not status) then
print("Failed to load config.lua: " .. err)
if (status) then
return true
else
print("Failed to load " .. path .. ": " .. err)
end
else
print("Failed to parse config.lua: " .. err)
print("Failed to parse " .. path .. ": " .. err)
end
else
print("Failed to open config.lua")
print("Failed to open " .. path)
end
return false
end
function NazaraBuild:LoadConfig()
if (not self:LoadConfigFile("config.lua", self.Config) and not self:LoadConfigFile("config.lua.default", self.Config)) then
error("Failed to load config file")
end
local configTable = self.Config