aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/luarocks/admin/cmd/add.lua3
-rw-r--r--src/luarocks/cmd.lua4
-rw-r--r--src/luarocks/cmd/config.lua1
-rw-r--r--src/luarocks/cmd/new_version.lua2
4 files changed, 4 insertions, 6 deletions
diff --git a/src/luarocks/admin/cmd/add.lua b/src/luarocks/admin/cmd/add.lua
index 0682d89b..ad16c232 100644
--- a/src/luarocks/admin/cmd/add.lua
+++ b/src/luarocks/admin/cmd/add.lua
@@ -12,8 +12,7 @@ local cache = require("luarocks.admin.cache")
12local index = require("luarocks.admin.index") 12local index = require("luarocks.admin.index")
13 13
14function add.add_to_parser(parser) 14function add.add_to_parser(parser)
15 local cmd = parser:command("add", "Add a rock or rockspec to a rocks server.", 15 local cmd = parser:command("add", "Add a rock or rockspec to a rocks server.", util.see_also())
16 util.see_also())
17 :add_help("--help") 16 :add_help("--help")
18 17
19 cmd:argument("rock", "A local rockspec or rock file.") 18 cmd:argument("rock", "A local rockspec or rock file.")
diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index ab8d22c6..d85661d8 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -308,7 +308,7 @@ local function get_status(status)
308 return status and "ok" or "not found" 308 return status and "ok" or "not found"
309end 309end
310 310
311local function get_config_text() 311local function get_config_text(cfg)
312 local buf = "Configuration:\n Lua version: "..cfg.lua_version.."\n" 312 local buf = "Configuration:\n Lua version: "..cfg.lua_version.."\n"
313 if cfg.luajit_version then 313 if cfg.luajit_version then
314 buf = buf.." LuaJIT version: "..cfg.luajit_version.."\n" 314 buf = buf.." LuaJIT version: "..cfg.luajit_version.."\n"
@@ -343,7 +343,7 @@ Variables:
343 Variables from the "variables" table of the configuration file can be 343 Variables from the "variables" table of the configuration file can be
344 overridden with VAR=VALUE assignments. 344 overridden with VAR=VALUE assignments.
345 345
346]]..get_config_text() 346]]..get_config_text(cfg)
347 347
348 local parser = argparse( 348 local parser = argparse(
349 dir.base_name(program), "LuaRocks "..cfg.program_version..", the Lua package manager\n\n".. 349 dir.base_name(program), "LuaRocks "..cfg.program_version..", the Lua package manager\n\n"..
diff --git a/src/luarocks/cmd/config.lua b/src/luarocks/cmd/config.lua
index fa954b3c..4f688a65 100644
--- a/src/luarocks/cmd/config.lua
+++ b/src/luarocks/cmd/config.lua
@@ -59,7 +59,6 @@ Query information about the LuaRocks configuration.
59 :args("?") 59 :args("?")
60 60
61 cmd:option("--scope", "The scope indicates which config file should be rewritten.\n".. 61 cmd:option("--scope", "The scope indicates which config file should be rewritten.\n"..
62 'Accepted values are "system", "user" or "project".\n'..
63 '* Using a wrapper created with `luarocks init`, the default is "project".\n'.. 62 '* Using a wrapper created with `luarocks init`, the default is "project".\n'..
64 '* Using --local (or when `local_by_default` is `true`), the default is "user".\n'.. 63 '* Using --local (or when `local_by_default` is `true`), the default is "user".\n'..
65 '* Otherwise, the default is "system".') 64 '* Otherwise, the default is "system".')
diff --git a/src/luarocks/cmd/new_version.lua b/src/luarocks/cmd/new_version.lua
index 7c3e9329..95d762be 100644
--- a/src/luarocks/cmd/new_version.lua
+++ b/src/luarocks/cmd/new_version.lua
@@ -21,7 +21,7 @@ default server. If a rockspec is given, it uses it instead. If no argument
21is given, it looks for a rockspec same way 'luarocks make' does. 21is given, it looks for a rockspec same way 'luarocks make' does.
22 22
23If the version number is not given and tag is passed using --tag, 23If the version number is not given and tag is passed using --tag,
24it is used as the version, with 'v' removed from beginnnumbering. 24it is used as the version, with 'v' removed from beginning.
25Otherwise, it only increments the revision number of the given 25Otherwise, it only increments the revision number of the given
26(or downloaded) rockspec. 26(or downloaded) rockspec.
27 27