From 3cf0c501f2ab62a73f25c6b244b8b019d4b1a36a Mon Sep 17 00:00:00 2001 From: Paul Ouellette Date: Wed, 19 Jun 2019 12:30:17 -0400 Subject: Remove program_name cmd.run_command argument --- src/bin/luarocks | 2 +- src/bin/luarocks-admin | 2 +- src/luarocks/cmd.lua | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bin/luarocks b/src/bin/luarocks index 18c8fac6..56caaa60 100755 --- a/src/bin/luarocks +++ b/src/bin/luarocks @@ -32,4 +32,4 @@ local commands = { test = "luarocks.cmd.test", } -cmd.run_command("luarocks", description, commands, "luarocks.cmd.external", ...) +cmd.run_command(description, commands, "luarocks.cmd.external", ...) diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin index db746bea..4a85e45b 100755 --- a/src/bin/luarocks-admin +++ b/src/bin/luarocks-admin @@ -15,4 +15,4 @@ local commands = { refresh_cache = "luarocks.admin.cmd.refresh_cache", } -cmd.run_command("luarocks-admin", description, commands, "luarocks.admin.cmd.external", ...) +cmd.run_command(description, commands, "luarocks.admin.cmd.external", ...) diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua index 34dc75d8..1c8f0946 100644 --- a/src/luarocks/cmd.lua +++ b/src/luarocks/cmd.lua @@ -337,7 +337,7 @@ local function get_config_text() return buf.."\n" end -local function get_parser(program_name, description, cmd_modules) +local function get_parser(description, cmd_modules) local epilog = [[ Variables: Variables from the "variables" table of the configuration file can be @@ -346,7 +346,7 @@ Variables: ]]..get_config_text() local parser = argparse( - program_name, "LuaRocks "..cfg.program_version..", the Lua package manager\n\n".. + dir.base_name(program), "LuaRocks "..cfg.program_version..", the Lua package manager\n\n".. program.." - "..description, epilog) :help_max_width(80) :add_help("--help") @@ -408,7 +408,7 @@ end -- @param commands table: contains the loaded modules representing commands. -- @param external_namespace string: where to look for external commands. -- @param ... string: Arguments given on the command-line. -function cmd.run_command(program_name, description, commands, external_namespace, ...) +function cmd.run_command(description, commands, external_namespace, ...) check_popen() @@ -452,7 +452,7 @@ function cmd.run_command(program_name, description, commands, external_namespace end local args, cmdline_vars = process_cmdline_vars(...) - local parser = get_parser(program_name, description, cmd_modules) + local parser = get_parser(description, cmd_modules) args = parser:parse(args) if not args.command then -- cgit v1.2.3-55-g6feb