10 files changed, 36 insertions, 35 deletions

diff --git a/src/bin/luarocks b/src/bin/luarocks
index 21f17da9..88a1d1ca 100755
--- a/src/bin/luarocks
+++ b/src/bin/luarocks
@@ -9,25 +9,25 @@ local command_line = require("luarocks.command_line")
 program_description = "LuaRocks main command-line interface"
 
 commands = {
-   help = "luarocks.help",
-   pack = "luarocks.pack",
-   unpack = "luarocks.unpack",
-   build = "luarocks.build",
-   install = "luarocks.install",
-   search = "luarocks.search",
-   list = "luarocks.list",
-   remove = "luarocks.remove",
-   make = "luarocks.make",
-   download = "luarocks.download",
-   path = "luarocks.path_cmd",
-   show = "luarocks.show",
-   new_version = "luarocks.new_version",
-   lint = "luarocks.lint",
-   write_rockspec = "luarocks.write_rockspec",
-   purge = "luarocks.purge",
-   doc = "luarocks.doc",
-   upload = "luarocks.upload",
-   config = "luarocks.config_cmd",
+   help = "luarocks.cmd.help",
+   pack = "luarocks.cmd.pack",
+   unpack = "luarocks.cmd.unpack",
+   build = "luarocks.cmd.build",
+   install = "luarocks.cmd.install",
+   search = "luarocks.cmd.search",
+   list = "luarocks.cmd.list",
+   remove = "luarocks.cmd.remove",
+   make = "luarocks.cmd.make",
+   download = "luarocks.cmd.download",
+   path = "luarocks.cmd.path",
+   show = "luarocks.cmd.show",
+   new_version = "luarocks.cmd.new_version",
+   lint = "luarocks.cmd.lint",
+   write_rockspec = "luarocks.cmd.write_rockspec",
+   purge = "luarocks.cmd.purge",
+   doc = "luarocks.cmd.doc",
+   upload = "luarocks.cmd.upload",
+   config = "luarocks.cmd.config",
 }
 
 command_line.run_command(...)
diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin
index 660c0a70..5db24640 100755
--- a/src/bin/luarocks-admin
+++ b/src/bin/luarocks-admin
@@ -9,11 +9,11 @@ local command_line = require("luarocks.command_line")
 program_description = "LuaRocks repository administration interface"
 
 commands = {
-   help = "luarocks.help",
-   make_manifest = "luarocks.admin.make_manifest",
-   add = "luarocks.admin.add",
-   remove = "luarocks.admin.remove",
-   refresh_cache = "luarocks.admin.refresh_cache",
+   help = "luarocks.cmd.help",
+   make_manifest = "luarocks.admin.cmd.make_manifest",
+   add = "luarocks.admin.cmd.add",
+   remove = "luarocks.admin.cmd.remove",
+   refresh_cache = "luarocks.admin.cmd.refresh_cache",
 }
 
 command_line.run_command(...)
diff --git a/src/luarocks/admin/add.lua b/src/luarocks/admin/cmd/add.lua
index daf46c1d..daf46c1d 100644
--- a/src/luarocks/admin/add.lua
+++ b/src/luarocks/admin/cmd/add.lua
diff --git a/src/luarocks/admin/make_manifest.lua b/src/luarocks/admin/cmd/make_manifest.lua
index 57851942..57851942 100644
--- a/src/luarocks/admin/make_manifest.lua
+++ b/src/luarocks/admin/cmd/make_manifest.lua
diff --git a/src/luarocks/admin/refresh_cache.lua b/src/luarocks/admin/cmd/refresh_cache.lua
index 947dbfb0..947dbfb0 100644
--- a/src/luarocks/admin/refresh_cache.lua
+++ b/src/luarocks/admin/cmd/refresh_cache.lua
diff --git a/src/luarocks/admin/remove.lua b/src/luarocks/admin/cmd/remove.lua
index 763a166f..763a166f 100644
--- a/src/luarocks/admin/remove.lua
+++ b/src/luarocks/admin/cmd/remove.lua
diff --git a/src/luarocks/cmd/install.lua b/src/luarocks/cmd/install.lua
index c9b085f5..33cc8fbf 100644
--- a/src/luarocks/cmd/install.lua
+++ b/src/luarocks/cmd/install.lua
@@ -10,6 +10,7 @@ local fs = require("luarocks.fs")
 local deps = require("luarocks.deps")
 local writer = require("luarocks.manif.writer")
 local remove = require("luarocks.remove")
+local search = require("luarocks.search")
 local cfg = require("luarocks.core.cfg")
 
 install.help_summary = "Install a rock."
@@ -154,7 +155,7 @@ function install.command(flags, name, version)
    if not ok then return nil, err, cfg.errorcodes.PERMISSIONDENIED end
 
    if name:match("%.rockspec$") or name:match("%.src%.rock$") then
-      local build = require("luarocks.build")
+      local build = require("luarocks.cmd.build")
       return build.command(flags, name)
    elseif name:match("%.rock$") then
       if flags["only-deps"] then
@@ -170,7 +171,6 @@ function install.command(flags, name, version)
       end
       return name, version
    else
-      local search = require("luarocks.search")
       local url, err = search.find_suitable_rock(search.make_query(name:lower(), version))
       if not url then
          return nil, err
diff --git a/src/luarocks/cmd/search.lua b/src/luarocks/cmd/search.lua
index 109fe805..c4e4058d 100644
--- a/src/luarocks/cmd/search.lua
+++ b/src/luarocks/cmd/search.lua
@@ -1,14 +1,15 @@
 
 --- Module implementing the LuaRocks "search" command.
 -- Queries LuaRocks servers.
-local search = {}
+local cmd_search = {}
 
 local cfg = require("luarocks.core.cfg")
 local util = require("luarocks.util")
+local search = require("luarocks.search")
 
-search.help_summary = "Query the LuaRocks servers."
-search.help_arguments = "[--source] [--binary] { <name> [<version>] | --all }"
-search.help = [[
+cmd_search.help_summary = "Query the LuaRocks servers."
+cmd_search.help_arguments = "[--source] [--binary] { <name> [<version>] | --all }"
+cmd_search.help = [[
 --source  Return only rockspecs and source rocks,
           to be used with the "build" command.
 --binary  Return only pure Lua and binary rocks (rocks that can be used
@@ -44,7 +45,7 @@ end
 -- @param version string or nil: a version may also be passed.
 -- @return boolean or (nil, string): True if build was successful; nil and an
 -- error message otherwise.
-function search.command(flags, name, version)
+function cmd_search.command(flags, name, version)
    if flags["all"] then
       name, version = "", nil
    end
@@ -70,4 +71,4 @@ function search.command(flags, name, version)
    return true
 end
 
-return search
+return cmd_search
diff --git a/src/luarocks/deps.lua b/src/luarocks/deps.lua
index acbf1dd6..081265a5 100644
--- a/src/luarocks/deps.lua
+++ b/src/luarocks/deps.lua
@@ -240,7 +240,7 @@ end
 function deps.fulfill_dependencies(rockspec, deps_mode)
 
    local search = require("luarocks.search")
-   local install = require("luarocks.install")
+   local install = require("luarocks.cmd.install")
 
    if rockspec.supported_platforms then
       if not deps.platforms_set then
diff --git a/src/luarocks/download.lua b/src/luarocks/download.lua
index c0f2678f..ec9996b2 100644
--- a/src/luarocks/download.lua
+++ b/src/luarocks/download.lua
@@ -32,8 +32,8 @@ function download.download(arch, name, version, all)
       local has_result = false
       local all_ok = true
       local any_err = ""
-      for _, result in pairs(results) do
-         for _, items in pairs(result) do
+      for name, result in pairs(results) do
+         for version, items in pairs(result) do
             for _, item in ipairs(items) do
                -- Ignore provided rocks.
                if item.arch ~= "installed" then