From 91291fd91c7d0cfef32a1be64a0bf298a3421b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Thu, 27 Aug 2020 19:49:34 +0200 Subject: [PATCH] Load default config file is none is provided --- ...fig.lua.default.lua => config.lua.default} | 0 build/scripts/common.lua | 24 +++++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) rename build/{config.lua.default.lua => config.lua.default} (100%) diff --git a/build/config.lua.default.lua b/build/config.lua.default similarity index 100% rename from build/config.lua.default.lua rename to build/config.lua.default diff --git a/build/scripts/common.lua b/build/scripts/common.lua index 1edf10fd3..1c68dff88 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -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