cmd: rename luarocks.command_line to luarocks.cmd

3 files changed, 9 insertions, 9 deletions

diff --git a/src/bin/luarocks b/src/bin/luarocks
index 583b50b8..d776445c 100755
--- a/src/bin/luarocks
+++ b/src/bin/luarocks
@@ -4,7 +4,7 @@
 local cfg = require("luarocks.core.cfg")
 
 local loader = require("luarocks.loader")
-local command_line = require("luarocks.command_line")
+local cmd = require("luarocks.cmd")
 
 program_description = "LuaRocks main command-line interface"
 
@@ -33,4 +33,4 @@ commands = {
    test = "luarocks.cmd.test",
 }
 
-command_line.run_command(...)
+cmd.run_command(...)
diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin
index 5db24640..4521ac26 100755
--- a/src/bin/luarocks-admin
+++ b/src/bin/luarocks-admin
@@ -4,7 +4,7 @@
 local cfg = require("luarocks.core.cfg")
 
 local loader = require("luarocks.loader")
-local command_line = require("luarocks.command_line")
+local cmd = require("luarocks.cmd")
 
 program_description = "LuaRocks repository administration interface"
 
@@ -16,4 +16,4 @@ commands = {
    refresh_cache = "luarocks.admin.cmd.refresh_cache",
 }
 
-command_line.run_command(...)
+cmd.run_command(...)
diff --git a/src/luarocks/command_line.lua b/src/luarocks/cmd.lua
index b542fb9c..3048d956 100644
--- a/src/luarocks/command_line.lua
+++ b/src/luarocks/cmd.lua
@@ -1,6 +1,6 @@
 
 --- Functions for command-line scripts.
-local command_line = {}
+local cmd = {}
 
 local unpack = unpack or table.unpack
 
@@ -72,7 +72,7 @@ end
 -- Uses the global table "commands", which contains
 -- the loaded modules representing commands.
 -- @param ... string: Arguments given on the command-line.
-function command_line.run_command(...)
+function cmd.run_command(...)
    local args = {...}
    local cmdline_vars = {}
    for i = #args, 1, -1 do
@@ -239,8 +239,8 @@ function command_line.run_command(...)
    end
    
    if commands[command] then
-      local cmd = require(commands[command])
-      local call_ok, ok, err, exitcode = xpcall(function() return cmd.command(flags, unpack(nonflags)) end, error_handler)
+      local cmd_mod = require(commands[command])
+      local call_ok, ok, err, exitcode = xpcall(function() return cmd_mod.command(flags, unpack(nonflags)) end, error_handler)
       if not call_ok then
          die(ok, cfg.errorcodes.CRASH)
       elseif not ok then
@@ -252,4 +252,4 @@ function command_line.run_command(...)
    util.run_scheduled_functions()
 end
 
-return command_line
+return cmd