Merge branch 'master' of https://github.com/keplerproject/luarocks

2 files changed, 24 insertions, 23 deletions

diff --git a/src/bin/luarocks b/src/bin/luarocks
index 6ab27fa3..e9cfc349 100755
--- a/src/bin/luarocks
+++ b/src/bin/luarocks
@@ -5,22 +5,24 @@ local command_line = require("luarocks.command_line")
 
 program_description = "LuaRocks main command-line interface"
 
-commands = {}
-commands.help = require("luarocks.help")
-commands.pack = require("luarocks.pack")
-commands.unpack = require("luarocks.unpack")
-commands.build = require("luarocks.build")
-commands.install = require("luarocks.install")
-commands.search = require("luarocks.search")
-commands.list = require("luarocks.list")
-commands.remove = require("luarocks.remove")
-commands.make = require("luarocks.make")
-commands.download = require("luarocks.download")
-commands.path = require("luarocks.path")
-commands.show = require("luarocks.show")
-commands.new_version = require("luarocks.new_version")
-commands.lint = require("luarocks.lint")
-commands.write_rockspec = require("luarocks.write_rockspec")
-commands.purge = require("luarocks.purge")
+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",
+   show = "luarocks.show",
+   new_version = "luarocks.new_version",
+   lint = "luarocks.lint",
+   write_rockspec = "luarocks.write_rockspec",
+   purge = "luarocks.purge",
+   doc = "luarocks.doc",
+}
 
 command_line.run_command(...)
diff --git a/src/bin/luarocks-admin b/src/bin/luarocks-admin
index 983dda87..e7f49c25 100755
--- a/src/bin/luarocks-admin
+++ b/src/bin/luarocks-admin
@@ -6,12 +6,11 @@ local command_line = require("luarocks.command_line")
 program_description = "LuaRocks repository administration interface"
 
 commands = {
+   help = "luarocks.help",
+   make_manifest = "luarocks.make_manifest",
+   add = "luarocks.add",
+   remove = "luarocks.admin_remove",
+   refresh_cache = "luarocks.refresh_cache",
 }
 
-commands.help = require("luarocks.help")
-commands.make_manifest = require("luarocks.make_manifest")
-commands.add = require("luarocks.add")
-commands.remove = require("luarocks.admin_remove")
-commands.refresh_cache = require("luarocks.refresh_cache")
-
 command_line.run_command(...)