summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-03-12 23:28:00 +0800
committerruki <[email protected]>2023-03-12 23:28:00 +0800
commita4c78cb5bd0c4cc54e9c892688cf1ff0135a2451 (patch)
treef6ef98b31f59dcfb70fe7f9adb291b17cf054f1f
parentf1795b8c2078279454d8b8c2b603eded1d3dfb41 (diff)
improve config
-rw-r--r--xmake/modules/private/xrepo/action/env.lua12
1 files changed, 1 insertions, 11 deletions
diff --git a/xmake/modules/private/xrepo/action/env.lua b/xmake/modules/private/xrepo/action/env.lua
index ffb073ad1..fbe7dce7f 100644
--- a/xmake/modules/private/xrepo/action/env.lua
+++ b/xmake/modules/private/xrepo/action/env.lua
@@ -362,17 +362,7 @@ function info(key, bnd)
elseif key == "envfile" then
print(os.tmpfile())
elseif key == "config" then
- local oldir = os.curdir()
- local boundenv = _get_boundenv({bind = bnd})
- local has_envfile = (boundenv and os.isfile(boundenv)) and true or false
- if has_envfile or os.isfile(os.projectfile()) then
- if has_envfile then
- _enter_project()
- table.insert(project.rcfiles(), boundenv)
- end
- task.run("config", {}, {disable_dump = true})
- end
- os.cd(oldir)
+ _package_getenvs({bind = bnd})
elseif key:startswith("script.") then
local shell = key:match("script%.(.+)")
io.write(_get_env_script(_package_getenvs({bind = bnd}), shell, false))