d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lualoader: When restoring environment, only restore unchanged vars

Browse Source 
Track the latest value we've set an environment variable to, and only
restore those that are unchanged from that.

This gives us some leeway to make sure we're not clobbering variables
overwritten by menu changes.
This commit is contained in:
Kyle Evans 2018-02-20 22:47:49 +00:00
parent 55927f2836
commit e73c944fc0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=329680
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
stand/lua/config.lua
View File

@ -142,13 +142,26 @@ function config.setCarouselIndex(id, idx)
end
function config.restoreEnv()
-- Examine changed environment variables
for k, v in pairs(config.env_changed) do
local restore_value = config.env_restore[k];
if (restore_value == nil) then
-- This one doesn't need restored for some reason
goto continue;
end
local current_value = loader.getenv(k);
if (current_value ~= v) then
-- This was overwritten by some action taken on the menu
-- most likely; we'll leave it be.
goto continue;
end
restore_value = restore_value.value;
if (restore_value ~= nil) then
loader.setenv(k, restore_value);
else
loader.unsetenv(k);
end
::continue::
end
config.env_changed = {};
@ -156,12 +169,13 @@ function config.restoreEnv()
end
function config.setenv(k, v)
-- Do we need to track this change?
if (config.env_changed[k] == nil) then
config.env_changed[k] = true;
config.env_restore[k] = loader.getenv(k);
-- Track the original value for this if we haven't already
if (config.env_restore[k] == nil) then
config.env_restore[k] = {value = loader.getenv(k)};
end
config.env_changed[k] = v;
return loader.setenv(k, v);
end