From b1fd49273ed6691283f55eeb3f318214618e3f18 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Sun, 18 Feb 2024 20:34:33 -0300
Subject: feat(path): add --full flag for --lr-path and --lr-cpath
By default, `--lr-path` and `--lr-cpath` only include the paths derived by the
LuaRocks rocks_trees. Using `--full` includes any other components defined in
your system's package.(c)path, either via the running interpreter's default
paths or via `LUA_(C)PATH(_5_x)` environment variables (in short, using
`--full` produces the same lists as shown in the shell outputs of `luarocks
path`.
Closes #1351.
---
src/luarocks/cmd/path.lua | 40 ++++++++++++++++++++++++++--------------
1 file changed, 26 insertions(+), 14 deletions(-)
(limited to 'src')
diff --git a/src/luarocks/cmd/path.lua b/src/luarocks/cmd/path.lua
index 9b6fee71..ac78724d 100644
--- a/src/luarocks/cmd/path.lua
+++ b/src/luarocks/cmd/path.lua
@@ -22,8 +22,15 @@ And on Windows:
cmd:flag("--no-bin", "Do not export the PATH variable.")
cmd:flag("--append", "Appends the paths to the existing paths. Default is "..
"to prefix the LR paths to the existing paths.")
- cmd:flag("--lr-path", "Exports the Lua path (not formatted as shell command).")
- cmd:flag("--lr-cpath", "Exports the Lua cpath (not formatted as shell command).")
+ cmd:flag("--lr-path", "Prints Lua path components defined by the configured rocks trees " ..
+ "(not formatted as a shell command)")
+ cmd:flag("--lr-cpath", "Prints Lua cpath components defined by the configured rocks trees " ..
+ "(not formatted as a shell command)")
+ cmd:flag("--full", "By default, --lr-path and --lr-cpath only include the paths " ..
+ "derived by the LuaRocks rocks_trees. Using --full includes any other components " ..
+ "defined in your system's package.(c)path, either via the running interpreter's " ..
+ "default paths or via LUA_(C)PATH(_5_x) environment variables (in short, using " ..
+ "--full produces the same lists as shown in the shell outputs of 'luarocks path').")
cmd:flag("--lr-bin", "Exports the system path (not formatted as shell command).")
cmd:flag("--bin"):hidden(true)
end
@@ -34,6 +41,23 @@ function path_cmd.command(args)
local lr_path, lr_cpath, lr_bin = cfg.package_paths(args.tree)
local path_sep = cfg.export_path_separator
+ local full_list = ((not args.lr_path) and (not args.lr_cpath) and (not args.lr_bin))
+ or args.full
+
+ local clean_path = util.cleanup_path(os.getenv("PATH") or "", path_sep, nil, true)
+
+ if full_list then
+ if args.append then
+ lr_path = package.path .. ";" .. lr_path
+ lr_cpath = package.cpath .. ";" .. lr_cpath
+ lr_bin = clean_path .. path_sep .. lr_bin
+ else
+ lr_path = lr_path.. ";" .. package.path
+ lr_cpath = lr_cpath .. ";" .. package.cpath
+ lr_bin = lr_bin .. path_sep .. clean_path
+ end
+ end
+
if args.lr_path then
util.printout(util.cleanup_path(lr_path, ';', cfg.lua_version, true))
return true
@@ -45,18 +69,6 @@ function path_cmd.command(args)
return true
end
- local clean_path = util.cleanup_path(os.getenv("PATH") or "", path_sep, nil, true)
-
- if args.append then
- lr_path = package.path .. ";" .. lr_path
- lr_cpath = package.cpath .. ";" .. lr_cpath
- lr_bin = clean_path .. path_sep .. lr_bin
- else
- lr_path = lr_path.. ";" .. package.path
- lr_cpath = lr_cpath .. ";" .. package.cpath
- lr_bin = lr_bin .. path_sep .. clean_path
- end
-
local lpath_var, lcpath_var = util.lua_path_variables()
util.printout(fs.export_cmd(lpath_var, util.cleanup_path(lr_path, ';', cfg.lua_version, args.append)))
--
cgit v1.2.3-55-g6feb