From fd271f648d9a5d71777b6912f949d59241aed6f6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 20 Jul 2026 22:04:20 +0000 Subject: revert: undo deploy path display changes to command.tl and command.lua --- src/luarocks/build/command.lua | 20 +------------------- src/luarocks/build/command.tl | 20 +------------------- 2 files changed, 2 insertions(+), 38 deletions(-) (limited to 'src') diff --git a/src/luarocks/build/command.lua b/src/luarocks/build/command.lua index 22bed11b..a4eddb87 100644 --- a/src/luarocks/build/command.lua +++ b/src/luarocks/build/command.lua @@ -25,22 +25,8 @@ function command.run(rockspec, not_install) local build = rockspec.build - -- Save the original install command before substitution, - -- so we can display it with the final deploy paths instead of the staging paths. - local orig_install_command = build.install_command - util.variable_substitutions(build, rockspec.variables) - -- Create display variables that replace LUADIR/LIBDIR/BINDIR with the - -- actual deploy directories so the printed command shows the final destination. - local display_vars = {} - for k, v in pairs(rockspec.variables) do - display_vars[k] = v - end - if cfg.deploy_lua_dir then display_vars.LUADIR = cfg.deploy_lua_dir end - if cfg.deploy_lib_dir then display_vars.LIBDIR = cfg.deploy_lib_dir end - if cfg.deploy_bin_dir then display_vars.BINDIR = cfg.deploy_bin_dir end - local env = { CC = cfg.variables.CC, @@ -54,11 +40,7 @@ function command.run(rockspec, not_install) end end if build.install_command and not not_install then - -- Print with deploy paths for user clarity - local display = {install_command = orig_install_command} - util.variable_substitutions(display, display_vars) - util.printout(display.install_command) - -- Execute with staging paths (internal mechanism) + util.printout(build.install_command) if not fs.execute_env(env, build.install_command) then return nil, "Failed installing." end diff --git a/src/luarocks/build/command.tl b/src/luarocks/build/command.tl index 18f17ad9..10f8bb94 100644 --- a/src/luarocks/build/command.tl +++ b/src/luarocks/build/command.tl @@ -25,22 +25,8 @@ function command.run(rockspec: Rockspec, not_install: boolean): boolean, string, local build = rockspec.build as command.CommandBuild - -- Save the original install command before substitution, - -- so we can display it with the final deploy paths instead of the staging paths. - local orig_install_command = build.install_command - util.variable_substitutions(build as {string: string}, rockspec.variables) - -- Create display variables that replace LUADIR/LIBDIR/BINDIR with the - -- actual deploy directories so the printed command shows the final destination. - local display_vars: {string: string} = {} - for k, v in pairs(rockspec.variables as {string: string}) do - display_vars[k] = v - end - if cfg.deploy_lua_dir then display_vars.LUADIR = cfg.deploy_lua_dir end - if cfg.deploy_lib_dir then display_vars.LIBDIR = cfg.deploy_lib_dir end - if cfg.deploy_bin_dir then display_vars.BINDIR = cfg.deploy_bin_dir end - local env: {string: string} = { CC = cfg.variables.CC, --LD = cfg.variables.LD, @@ -54,11 +40,7 @@ function command.run(rockspec: Rockspec, not_install: boolean): boolean, string, end end if build.install_command and not not_install then - -- Print with deploy paths for user clarity - local display: {string: string} = {install_command = orig_install_command} - util.variable_substitutions(display, display_vars) - util.printout(display.install_command) - -- Execute with staging paths (internal mechanism) + util.printout(build.install_command) if not fs.execute_env(env, build.install_command) then return nil, "Failed installing." end -- cgit v1.2.3-55-g6feb