From 9724a3eb35ccfdb3d55c20da88c3fad5a7bb5e19 Mon Sep 17 00:00:00 2001 From: Jamie Reece Wilson Date: Tue, 12 Dec 2023 15:39:36 +0000 Subject: [PATCH] [*] bug fix --- Core/Actions/Actions.lua | 5 +++-- Core/main.lua | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Core/Actions/Actions.lua b/Core/Actions/Actions.lua index 7611608..d826564 100644 --- a/Core/Actions/Actions.lua +++ b/Core/Actions/Actions.lua @@ -45,8 +45,9 @@ local addBuildCommand = function(when, scriptType, path, cwdRelToProject, args) -- Aurora.Settings could take up too much of the win32 max command line buffer (8191 characters) -- This seems like a lot, but it should be well within the 8k limit -- Abs can be skipped and i really dont believe we need the other settings + local settings = {} if (Aurora.Settings.bActionsIncludeFull) then - local settings = + settings = { sAbsRoot = Aurora.Settings.sAbsRoot, sAbsAuRoot = Aurora.Settings.sAbsAuRoot, @@ -66,7 +67,7 @@ local addBuildCommand = function(when, scriptType, path, cwdRelToProject, args) } command = command .. " --settings=" .. base64.encode(json.encode(settings)) else - local settings = + settings = { sAbsRoot = Aurora.Settings.sAbsRoot, sRelAuRoot = Aurora.Settings.sRelAuRoot, diff --git a/Core/main.lua b/Core/main.lua index 108892d..1012c2a 100644 --- a/Core/main.lua +++ b/Core/main.lua @@ -77,8 +77,8 @@ local function addVisit(ina) local remoteLua = path .. "/Aurora.lua" local remoteJson = path .. "/Aurora.json" - local localJson = cwd .. Aurora.Settings.sRelRepoScripts .. "/" .. args.name .. ".aurora.json" - local localLua = cwd .. Aurora.Settings.sRelRepoScripts .. "/" .. args.name .. ".aurora.lua" + local localJson = Aurora.Settings.sAbsRepoScripts .. "/" .. args.name .. ".aurora.json" + local localLua = Aurora.Settings.sAbsRepoScripts .. "/" .. args.name .. ".aurora.lua" if (os.isfile(localLua)) then project.processor = auRequireAbs(localLua)(info) @@ -485,7 +485,7 @@ end local function addFeature(feature) --print("adding feature ", feature) - local script = Aurora.Settings.sAbsRoot .. Aurora.Settings.sRelScripts .. "/Features/" .. feature:lower() .. ".lua" + local script = Aurora.Settings.sAbsScripts .. "/Features/" .. feature:lower() .. ".lua" if (not os.isfile(script)) then auFatal("missing feature", feature, script)