Merge branch 'new-cmd-dir' into luarocks-3

2 files changed, 24 insertions, 24 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(...)