cmd build

13 files changed, 1285 insertions, 292 deletions

diff --git a/src/luarocks/build.tl b/src/luarocks/build.tl
index ffbc4f01..b3594225 100644
--- a/src/luarocks/build.tl
+++ b/src/luarocks/build.tl
@@ -403,8 +403,7 @@ end
 -- @param rockspec rockspec: the rockspec to build
 -- @param opts table: build options table
 -- @param cwd string or nil: The current working directory
--- @return (string, string) or (nil, string, [string]): Name and version of
--- installed rock if succeeded or nil and an error message followed by an error code.
+-- @return: Name and version of installed rock if succeeded or nil and an error message.
 function build.build_rockspec(rockspec: Rockspec, opts: BOpts, cwd: string): string, string
 
    cwd = cwd or dir.path(".")
diff --git a/src/luarocks/cmd-original.lua b/src/luarocks/cmd-original.lua
new file mode 100644
index 00000000..7710dc68
--- /dev/null
+++ b/src/luarocks/cmd-original.lua
@@ -0,0 +1,781 @@
+
+--- Functions for command-line scripts.
+local cmd = {}
+
+local manif = require("luarocks.manif")
+local config = require("luarocks.config")
+local util = require("luarocks.util")
+local path = require("luarocks.path")
+local cfg = require("luarocks.core.cfg")
+local dir = require("luarocks.dir")
+local fun = require("luarocks.fun")
+local fs = require("luarocks.fs")
+local argparse = require("luarocks.vendor.argparse")
+
+local unpack = table.unpack or unpack
+local pack = table.pack or function(...) return { n = select("#", ...), ... } end
+
+local hc_ok, hardcoded = pcall(require, "luarocks.core.hardcoded")
+if not hc_ok then
+   hardcoded = {}
+end
+
+local program = util.this_program("luarocks")
+
+cmd.errorcodes = {
+   OK = 0,
+   UNSPECIFIED = 1,
+   PERMISSIONDENIED = 2,
+   CONFIGFILE = 3,
+   LOCK = 4,
+   CRASH = 99
+}
+
+local function check_popen()
+   local popen_ok, popen_result = pcall(io.popen, "")
+   if popen_ok then
+      if popen_result then
+         popen_result:close()
+      end
+   else
+      io.stderr:write("Your version of Lua does not support io.popen,\n")
+      io.stderr:write("which is required by LuaRocks. Please check your Lua installation.\n")
+      os.exit(cmd.errorcodes.UNSPECIFIED)
+   end
+end
+
+local process_tree_args
+do
+   local function replace_tree(args, root, tree)
+      root = dir.normalize(root)
+      args.tree = root
+      path.use_tree(tree or root)
+   end
+
+   local function strip_trailing_slashes()
+      if type(cfg.root_dir) == "string" then
+        cfg.root_dir = cfg.root_dir:gsub("/+$", "")
+      else
+        cfg.root_dir.root = cfg.root_dir.root:gsub("/+$", "")
+      end
+      cfg.rocks_dir = cfg.rocks_dir:gsub("/+$", "")
+      cfg.deploy_bin_dir = cfg.deploy_bin_dir:gsub("/+$", "")
+      cfg.deploy_lua_dir = cfg.deploy_lua_dir:gsub("/+$", "")
+      cfg.deploy_lib_dir = cfg.deploy_lib_dir:gsub("/+$", "")
+   end
+
+   local function set_named_tree(args, name)
+      for _, tree in ipairs(cfg.rocks_trees) do
+         if type(tree) == "table" and name == tree.name then
+            if not tree.root then
+               return nil, "Configuration error: tree '"..tree.name.."' has no 'root' field."
+            end
+            replace_tree(args, tree.root, tree)
+            return true
+         end
+      end
+      return false
+   end
+
+   process_tree_args = function(args, project_dir)
+
+      if args.global then
+         local ok, err = set_named_tree(args, "system")
+         if not ok then
+            return nil, err
+         end
+      elseif args.tree then
+         local named = set_named_tree(args, args.tree)
+         if not named then
+            local root_dir = fs.absolute_name(args.tree)
+            replace_tree(args, root_dir)
+            if (args.deps_mode or cfg.deps_mode) ~= "order" then
+               table.insert(cfg.rocks_trees, 1, { name = "arg", root = root_dir } )
+            end
+         end
+      elseif args["local"] then
+         if fs.is_superuser() then
+            return nil, "The --local flag is meant for operating in a user's home directory.\n"..
+               "You are running as a superuser, which is intended for system-wide operation.\n"..
+               "To force using the superuser's home, use --tree explicitly."
+         else
+            local ok, err = set_named_tree(args, "user")
+            if not ok then
+               return nil, err
+            end
+         end
+      elseif args.project_tree then
+         local tree = args.project_tree
+         table.insert(cfg.rocks_trees, 1, { name = "project", root = tree } )
+         manif.load_rocks_tree_manifests()
+         path.use_tree(tree)
+      elseif project_dir then
+         local project_tree = project_dir .. "/lua_modules"
+         table.insert(cfg.rocks_trees, 1, { name = "project", root = project_tree } )
+         manif.load_rocks_tree_manifests()
+         path.use_tree(project_tree)
+      elseif cfg.local_by_default then
+         local ok, err = set_named_tree(args, "user")
+         if not ok then
+            return nil, err
+         end
+      else
+         local trees = cfg.rocks_trees
+         path.use_tree(trees[#trees])
+      end
+
+      strip_trailing_slashes()
+
+      cfg.variables.ROCKS_TREE = cfg.rocks_dir
+      cfg.variables.SCRIPTS_DIR = cfg.deploy_bin_dir
+
+      return true
+   end
+end
+
+local function process_server_args(args)
+   if args.server then
+      local protocol, pathname = dir.split_url(args.server)
+      table.insert(cfg.rocks_servers, 1, protocol.."://"..pathname)
+   end
+
+   if args.dev then
+      local append_dev = function(s) return dir.path(s, "dev") end
+      local dev_servers = fun.traverse(cfg.rocks_servers, append_dev)
+      cfg.rocks_servers = fun.concat(dev_servers, cfg.rocks_servers)
+   end
+
+   if args.only_server then
+      if args.dev then
+         return nil, "--only-server cannot be used with --dev"
+      end
+      if args.server then
+         return nil, "--only-server cannot be used with --server"
+      end
+      cfg.rocks_servers = { args.only_server }
+   end
+
+   return true
+end
+
+local function error_handler(err)
+   if not debug then
+      return err
+   end
+   local mode = "Arch.: " .. (cfg and cfg.arch or "unknown")
+   if package.config:sub(1, 1) == "\\" then
+      if cfg and cfg.fs_use_modules then
+         mode = mode .. " (fs_use_modules = true)"
+      end
+   end
+   if cfg and cfg.is_binary then
+      mode = mode .. " (binary)"
+   end
+   return debug.traceback("LuaRocks "..cfg.program_version..
+      " bug (please report at https://github.com/luarocks/luarocks/issues).\n"..
+      mode.."\n"..err, 2)
+end
+
+--- Display an error message and exit.
+-- @param message string: The error message.
+-- @param exitcode number: the exitcode to use
+local function die(message, exitcode)
+   assert(type(message) == "string", "bad error, expected string, got: " .. type(message))
+   assert(exitcode == nil or type(exitcode) == "number", "bad error, expected number, got: " .. type(exitcode) .. " - " .. tostring(exitcode))
+   util.printerr("\nError: "..message)
+
+   local ok, err = xpcall(util.run_scheduled_functions, error_handler)
+   if not ok then
+      util.printerr("\nError: "..err)
+      exitcode = cmd.errorcodes.CRASH
+   end
+
+   os.exit(exitcode or cmd.errorcodes.UNSPECIFIED)
+end
+
+local function search_lua(lua_version, verbose, search_at)
+   if search_at then
+      return util.find_lua(search_at, lua_version, verbose)
+   end
+
+   local path_sep = (package.config:sub(1, 1) == "\\" and ";" or ":")
+   local all_tried = {}
+   for bindir in (os.getenv("PATH") or ""):gmatch("[^"..path_sep.."]+") do
+      local searchdir = (bindir:gsub("[\\/]+bin[\\/]?$", ""))
+      local detected, tried = util.find_lua(searchdir, lua_version)
+      if detected then
+         return detected
+      else
+         table.insert(all_tried, tried)
+      end
+   end
+   return nil, "Could not find " ..
+               (lua_version and "Lua " .. lua_version or "Lua") ..
+               " in PATH." ..
+               (verbose and " Tried:\n" .. table.concat(all_tried, "\n") or "")
+end
+
+local init_config
+do
+   local detect_config_via_args
+   do
+      local function find_project_dir(project_tree)
+         if project_tree then
+            return project_tree:gsub("[/\\][^/\\]+$", ""), true
+         else
+            local try = "."
+            for _ = 1, 10 do -- FIXME detect when root dir was hit instead
+               if util.exists(try .. "/.luarocks") and util.exists(try .. "/lua_modules") then
+                  return dir.normalize(try), false
+               elseif util.exists(try .. "/.luarocks-no-project") then
+                  break
+               end
+               try = try .. "/.."
+            end
+         end
+         return nil
+      end
+
+      local function find_default_lua_version(args, project_dir)
+         if hardcoded.FORCE_CONFIG then
+            return nil
+         end
+
+         local dirs = {}
+         if project_dir then
+            table.insert(dirs, dir.path(project_dir, ".luarocks"))
+         end
+         if cfg.homeconfdir then
+            table.insert(dirs, cfg.homeconfdir)
+         end
+         table.insert(dirs, cfg.sysconfdir)
+         for _, d in ipairs(dirs) do
+            local f = dir.path(d, "default-lua-version.lua")
+            local mod, err = loadfile(f, "t")
+            if mod then
+               local pok, ver = pcall(mod)
+               if pok and type(ver) == "string" and ver:match("%d+.%d+") then
+                  if args.verbose then
+                     util.printout("Defaulting to Lua " .. ver .. " based on " .. f .. " ...")
+                  end
+                  return ver
+               end
+            end
+         end
+         return nil
+      end
+
+      local function find_version_from_config(dirname)
+         return fun.find(util.lua_versions("descending"), function(v)
+            if util.exists(dir.path(dirname, ".luarocks", "config-"..v..".lua")) then
+               return v
+            end
+         end)
+      end
+
+      local function detect_lua_via_args(args, project_dir)
+         local lua_version = args.lua_version
+                             or find_default_lua_version(args, project_dir)
+                             or (project_dir and find_version_from_config(project_dir))
+
+         if args.lua_dir then
+            local detected, err = util.find_lua(args.lua_dir, lua_version)
+            if not detected then
+               local suggestion = (not args.lua_version)
+                  and "\nYou may want to specify a different Lua version with --lua-version\n"
+                  or  ""
+               die(err .. suggestion)
+            end
+            return detected
+         end
+
+         if lua_version then
+            local detected = search_lua(lua_version)
+            if detected then
+               return detected
+            end
+            return {
+               lua_version = lua_version,
+            }
+         end
+
+         return {}
+      end
+
+      detect_config_via_args = function(args)
+         local project_dir, given
+         if not args.no_project then
+            project_dir, given = find_project_dir(args.project_tree)
+         end
+
+         local detected = detect_lua_via_args(args, project_dir)
+         if args.lua_version then
+            detected.given_lua_version = args.lua_version
+         end
+         if args.lua_dir then
+            detected.given_lua_dir = args.lua_dir
+         end
+         if given then
+            detected.given_project_dir = project_dir
+         end
+         detected.project_dir = project_dir
+         return detected
+      end
+   end
+
+   init_config = function(args)
+      local detected = detect_config_via_args(args)
+
+      local ok, err = cfg.init(detected, util.warning)
+      if not ok then
+         return nil, err
+      end
+
+      return (detected.lua_dir ~= nil)
+   end
+end
+
+local variables_help = [[
+Variables:
+   Variables from the "variables" table of the configuration file can be
+   overridden with VAR=VALUE assignments.
+
+]]
+
+local lua_example = package.config:sub(1, 1) == "\\"
+                    and "<d:\\path\\lua.exe>"
+                    or  "</path/lua>"
+
+local function show_status(file, status, err)
+   return (file and file .. " " or "") .. (status and "(ok)" or ("(" .. (err or "not found") ..")"))
+end
+
+local function use_to_fix_location(key, what)
+   local buf =  "                   ****************************************\n"
+   buf = buf .. "                   Use the command\n\n"
+   buf = buf .. "                      luarocks config " .. key .. " " .. (what or "<dir>") .. "\n\n"
+   buf = buf .. "                   to fix the location\n"
+   buf = buf .. "                   ****************************************\n"
+   return buf
+end
+
+local function get_config_text(cfg)  -- luacheck: ignore 431
+   local deps = require("luarocks.deps")
+
+   local libdir_ok = deps.check_lua_libdir(cfg.variables)
+   local incdir_ok = deps.check_lua_incdir(cfg.variables)
+   local lua_ok = cfg.variables.LUA and fs.exists(cfg.variables.LUA)
+
+   local buf = "Configuration:\n"
+   buf = buf.."   Lua:\n"
+   buf = buf.."      Version    : "..cfg.lua_version.."\n"
+   if cfg.luajit_version then
+      buf = buf.."      LuaJIT     : "..cfg.luajit_version.."\n"
+   end
+   buf = buf.."      LUA        : "..show_status(cfg.variables.LUA, lua_ok, "interpreter not found").."\n"
+   if not lua_ok then
+      buf = buf .. use_to_fix_location("variables.LUA", lua_example)
+   end
+   buf = buf.."      LUA_INCDIR : "..show_status(cfg.variables.LUA_INCDIR, incdir_ok, "lua.h not found").."\n"
+   if lua_ok and not incdir_ok then
+      buf = buf .. use_to_fix_location("variables.LUA_INCDIR")
+   end
+   buf = buf.."      LUA_LIBDIR : "..show_status(cfg.variables.LUA_LIBDIR, libdir_ok, "Lua library itself not found").."\n"
+   if lua_ok and not libdir_ok then
+      buf = buf .. use_to_fix_location("variables.LUA_LIBDIR")
+   end
+
+   buf = buf.."\n   Configuration files:\n"
+   local conf = cfg.config_files
+   buf = buf.."      System  : "..show_status(fs.absolute_name(conf.system.file), conf.system.found).."\n"
+   if conf.user.file then
+      buf = buf.."      User    : "..show_status(fs.absolute_name(conf.user.file), conf.user.found).."\n"
+   else
+      buf = buf.."      User    : disabled in this LuaRocks installation.\n"
+   end
+   if conf.project then
+      buf = buf.."      Project : "..show_status(fs.absolute_name(conf.project.file), conf.project.found).."\n"
+   end
+   buf = buf.."\n   Rocks trees in use: \n"
+   for _, tree in ipairs(cfg.rocks_trees) do
+      if type(tree) == "string" then
+         buf = buf.."      "..fs.absolute_name(tree)
+      else
+         local name = tree.name and " (\""..tree.name.."\")" or ""
+         buf = buf.."      "..fs.absolute_name(tree.root)..name
+      end
+      buf = buf .. "\n"
+   end
+
+   return buf
+end
+
+local function get_parser(description, cmd_modules)
+   local basename = dir.base_name(program)
+   local parser = argparse(
+      basename, "LuaRocks "..cfg.program_version..", the Lua package manager\n\n"..
+      program.." - "..description, variables_help.."Run '"..basename..
+      "' without any arguments to see the configuration.")
+      :help_max_width(80)
+      :add_help_command()
+      :add_complete_command({
+         help_max_width = 100,
+         summary = "Output a shell completion script.",
+         description = [[
+Output a shell completion script.
+
+Enabling completions for Bash:
+
+   Add the following line to your ~/.bashrc:
+      source <(]]..basename..[[ completion bash)
+   or save the completion script to the local completion directory:
+      ]]..basename..[[ completion bash > ~/.local/share/bash-completion/completions/]]..basename..[[
+
+
+Enabling completions for Zsh:
+
+   Save the completion script to a file in your $fpath.
+   You can add a new directory to your $fpath by adding e.g.
+      fpath=(~/.zfunc $fpath)
+   to your ~/.zshrc.
+   Then run:
+      ]]..basename..[[ completion zsh > ~/.zfunc/_]]..basename..[[
+
+
+Enabling completion for Fish:
+
+   Add the following line to your ~/.config/fish/config.fish:
+      ]]..basename..[[ completion fish | source
+   or save the completion script to the local completion directory:
+      ]]..basename..[[ completion fish > ~/.config/fish/completions/]]..basename..[[.fish
+]]})
+      :command_target("command")
+      :require_command(false)
+
+   parser:flag("--version", "Show version info and exit.")
+      :action(function()
+         util.printout(program.." "..cfg.program_version)
+         util.printout(description)
+         util.printout()
+         os.exit(cmd.errorcodes.OK)
+      end)
+   parser:flag("--dev", "Enable the sub-repositories in rocks servers for "..
+      "rockspecs of in-development versions.")
+   parser:option("--server", "Fetch rocks/rockspecs from this server "..
+      "(takes priority over config file).")
+      :hidden_name("--from")
+   parser:option("--only-server", "Fetch rocks/rockspecs from this server only "..
+      "(overrides any entries in the config file).")
+      :argname("<server>")
+      :hidden_name("--only-from")
+   parser:option("--only-sources", "Restrict downloads to paths matching the given URL.")
+      :argname("<url>")
+      :hidden_name("--only-sources-from")
+   parser:option("--namespace", "Specify the rocks server namespace to use.")
+      :convert(string.lower)
+   parser:option("--lua-dir", "Which Lua installation to use.")
+      :argname("<prefix>")
+   parser:option("--lua-version", "Which Lua version to use.")
+      :argname("<ver>")
+      :convert(function(s) return (s:match("^%d+%.%d+$")) end)
+   parser:option("--tree", "Which tree to operate on.")
+      :hidden_name("--to")
+   parser:flag("--local", "Use the tree in the user's home directory.\n"..
+      "To enable it, see '"..program.." help path'.")
+   parser:flag("--global", "Use the system tree when `local_by_default` is `true`.")
+   parser:flag("--no-project", "Do not use project tree even if running from a project folder.")
+   parser:flag("--force-lock", "Attempt to overwrite the lock for commands " ..
+      "that require exclusive access, such as 'install'")
+   parser:flag("--verbose", "Display verbose output of commands executed.")
+   parser:option("--timeout", "Timeout on network operations, in seconds.\n"..
+      "0 means no timeout (wait forever). Default is "..
+      tostring(cfg.connection_timeout)..".")
+      :argname("<seconds>")
+      :convert(tonumber)
+
+   -- Used internally to force the use of a particular project tree
+   parser:option("--project-tree"):hidden(true)
+
+   for _, module in util.sortedpairs(cmd_modules) do
+      module.add_to_parser(parser)
+   end
+
+   return parser
+end
+
+local function get_first_arg()
+   if not arg then
+      return
+   end
+   local first_arg = arg[0]
+   local i = -1
+   while arg[i] do
+      first_arg = arg[i]
+      i = i -1
+   end
+   return first_arg
+end
+
+--- Main command-line processor.
+-- Parses input arguments and calls the appropriate driver function
+-- to execute the action requested on the command-line, forwarding
+-- to it any additional arguments passed by the user.
+-- @param description string: Short summary description of the program.
+-- @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(description, commands, external_namespace, ...)
+
+   check_popen()
+
+   -- Preliminary initialization
+   cfg.init()
+
+   fs.init()
+
+   for _, module_name in ipairs(fs.modules(external_namespace)) do
+      if not commands[module_name] then
+         commands[module_name] = external_namespace.."."..module_name
+      end
+   end
+
+   local cmd_modules = {}
+   for name, module in pairs(commands) do
+      local pok, mod = pcall(require, module)
+      if pok and type(mod) == "table" then
+         local original_command = mod.command
+         if original_command then
+            if not mod.add_to_parser then
+               mod.add_to_parser = function(parser)
+                  parser:command(name, mod.help, util.see_also())
+                        :summary(mod.help_summary)
+                        :handle_options(false)
+                        :argument("input")
+                        :args("*")
+               end
+
+               mod.command = function(args)
+                  return original_command(args, unpack(args.input))
+               end
+            end
+            cmd_modules[name] = mod
+         else
+            util.warning("command module " .. module .. " does not implement command(), skipping")
+         end
+      else
+         util.warning("failed to load command module " .. module .. ": " .. mod)
+      end
+   end
+
+   local function process_cmdline_vars(...)
+      local args = pack(...)
+      local cmdline_vars = {}
+      local last = args.n
+      for i = 1, args.n do
+         if args[i] == "--" then
+            last = i - 1
+            break
+         end
+      end
+      for i = last, 1, -1 do
+         local arg = args[i]
+         if arg:match("^[^-][^=]*=") then
+            local var, val = arg:match("^([A-Z_][A-Z0-9_]*)=(.*)")
+            if val then
+               cmdline_vars[var] = val
+               table.remove(args, i)
+            else
+               die("Invalid assignment: "..arg)
+            end
+         end
+      end
+
+      return args, cmdline_vars
+   end
+
+   local args, cmdline_vars = process_cmdline_vars(...)
+   local parser = get_parser(description, cmd_modules)
+   args = parser:parse(args)
+
+   -- Compatibility for old flag
+   if args.nodeps then
+      args.deps_mode = "none"
+   end
+
+   if args.timeout then -- setting it in the config file will kick-in earlier in the process
+      cfg.connection_timeout = args.timeout
+   end
+
+   if args.command == "config" then
+      if args.key == "lua_version" and args.value then
+         args.lua_version = args.value
+      elseif args.key == "lua_dir" and args.value then
+         args.lua_dir = args.value
+      end
+   end
+
+   -----------------------------------------------------------------------------
+   local lua_found, err = init_config(args)
+   if err then
+      die(err)
+   end
+   -----------------------------------------------------------------------------
+
+   -- Now that the config is fully loaded, reinitialize fs using the full
+   -- feature set.
+   fs.init()
+
+   -- if the Lua interpreter wasn't explicitly found before cfg.init,
+   -- try again now.
+   local tried
+   if not lua_found then
+      local detected
+      detected, tried = search_lua(cfg.lua_version, args.verbose, cfg.variables.LUA_DIR)
+      if detected then
+         lua_found = true
+         cfg.variables.LUA = detected.lua
+         cfg.variables.LUA_DIR = detected.lua_dir
+         cfg.variables.LUA_BINDIR = detected.lua_bindir
+         if args.lua_dir then
+            cfg.variables.LUA_INCDIR = nil
+            cfg.variables.LUA_LIBDIR = nil
+         end
+      else
+         cfg.variables.LUA = nil
+         cfg.variables.LUA_DIR = nil
+         cfg.variables.LUA_BINDIR = nil
+         cfg.variables.LUA_INCDIR = nil
+         cfg.variables.LUA_LIBDIR = nil
+      end
+   end
+
+   if lua_found then
+      assert(cfg.variables.LUA)
+   else
+      -- Fallback producing _some_ Lua configuration based on the running interpreter.
+      -- Most likely won't produce correct results when running from the standalone binary,
+      -- so eventually we need to drop this and outright fail if Lua is not found
+      -- or explictly configured
+      if not cfg.variables.LUA then
+         local first_arg = get_first_arg()
+         local bin_dir = dir.dir_name(fs.absolute_name(first_arg))
+         local exe = dir.base_name(first_arg)
+         exe = exe:match("rocks") and ("lua" .. (cfg.arch:match("win") and ".exe" or "")) or exe
+         local full_path = dir.path(bin_dir, exe)
+         if util.check_lua_version(full_path, cfg.lua_version) then
+            cfg.variables.LUA = dir.path(bin_dir, exe)
+            cfg.variables.LUA_DIR = bin_dir:gsub("[/\\]bin[/\\]?$", "")
+            cfg.variables.LUA_BINDIR = bin_dir
+            cfg.variables.LUA_INCDIR = nil
+            cfg.variables.LUA_LIBDIR = nil
+         end
+      end
+   end
+
+   cfg.lua_found = lua_found
+
+   if cfg.project_dir then
+      cfg.project_dir = fs.absolute_name(cfg.project_dir)
+   end
+
+   if args.verbose then
+      cfg.verbose = true
+      print(("-"):rep(79))
+      print("Current configuration:")
+      print(("-"):rep(79))
+      print(config.to_string(cfg))
+      print(("-"):rep(79))
+      fs.verbose()
+   end
+
+   if (not fs.current_dir()) or fs.current_dir() == "" then
+      die("Current directory does not exist. Please run LuaRocks from an existing directory.")
+   end
+
+   local ok, err = process_tree_args(args, cfg.project_dir)
+   if not ok then
+      die(err)
+   end
+
+   ok, err = process_server_args(args)
+   if not ok then
+      die(err)
+   end
+
+   if args.only_sources then
+      cfg.only_sources_from = args.only_sources
+   end
+
+   for k, v in pairs(cmdline_vars) do
+      cfg.variables[k] = v
+   end
+
+   -- if running as superuser, use system cache dir
+   if fs.is_superuser() then
+      cfg.local_cache = dir.path(fs.system_cache_dir(), "luarocks")
+   end
+
+   if args.no_manifest then
+      cfg.no_manifest = true
+   end
+
+   if not args.command then
+      parser:epilog(variables_help..get_config_text(cfg))
+      util.printout()
+      util.printout(parser:get_help())
+      util.printout()
+      os.exit(cmd.errorcodes.OK)
+   end
+
+   if not cfg.variables["LUA"] and args.command ~= "config" and args.command ~= "help" then
+      local flag = (not cfg.project_tree)
+                   and "--local "
+                   or ""
+      if args.lua_version then
+         flag = "--lua-version=" .. args.lua_version .. " " .. flag
+      end
+      die((tried or "Lua interpreter not found.") ..
+         "\nPlease set your Lua interpreter with:\n\n" ..
+         "   luarocks " .. flag.. "config variables.LUA " .. lua_example .. "\n")
+   end
+
+   local cmd_mod = cmd_modules[args.command]
+
+   local lock
+   if cmd_mod.needs_lock and cmd_mod.needs_lock(args) then
+      local ok, err = fs.check_command_permissions(args)
+      if not ok then
+         die(err, cmd.errorcodes.PERMISSIONDENIED)
+      end
+
+      lock, err = fs.lock_access(path.root_dir(cfg.root_dir), args.force_lock)
+      if not lock then
+         err = args.force_lock
+               and ("failed to force the lock" .. (err and ": " .. err or ""))
+               or  (err and err ~= "File exists")
+                   and err
+                   or  "try --force-lock to overwrite the lock"
+
+         die("command '" .. args.command .. "' " ..
+             "requires exclusive write access to " .. path.root_dir(cfg.root_dir) .. " - " ..
+             err, cmd.errorcodes.LOCK)
+      end
+   end
+
+   local call_ok, ok, err, exitcode = xpcall(function()
+      return cmd_mod.command(args)
+   end, error_handler)
+
+   if lock then
+      fs.unlock_access(lock)
+   end
+
+   if not call_ok then
+      die(ok, cmd.errorcodes.CRASH)
+   elseif not ok then
+      die(err, exitcode)
+   end
+   util.run_scheduled_functions()
+end
+
+return cmd
diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index 7710dc68..3cf565bf 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -1,6 +1,16 @@
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local assert = _tl_compat and _tl_compat.assert or assert; local debug = _tl_compat and _tl_compat.debug or debug; local io = _tl_compat and _tl_compat.io or io; local ipairs = _tl_compat and _tl_compat.ipairs or ipairs; local loadfile = _tl_compat and _tl_compat.loadfile or loadfile; local os = _tl_compat and _tl_compat.os or os; local package = _tl_compat and _tl_compat.package or package; local pairs = _tl_compat and _tl_compat.pairs or pairs; local pcall = _tl_compat and _tl_compat.pcall or pcall; local string = _tl_compat and _tl_compat.string or string; local table = _tl_compat and _tl_compat.table or table; local _tl_table_unpack = unpack or table.unpack; local xpcall = _tl_compat and _tl_compat.xpcall or xpcall
+
+local cmd = {Module = {}, }
+
+
+
+
+
+
+
+
+
 
---- Functions for command-line scripts.
-local cmd = {}
 
 local manif = require("luarocks.manif")
 local config = require("luarocks.config")
@@ -12,8 +22,22 @@ local fun = require("luarocks.fun")
 local fs = require("luarocks.fs")
 local argparse = require("luarocks.vendor.argparse")
 
-local unpack = table.unpack or unpack
-local pack = table.pack or function(...) return { n = select("#", ...), ... } end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 local hc_ok, hardcoded = pcall(require, "luarocks.core.hardcoded")
 if not hc_ok then
@@ -28,7 +52,7 @@ cmd.errorcodes = {
    PERMISSIONDENIED = 2,
    CONFIGFILE = 3,
    LOCK = 4,
-   CRASH = 99
+   CRASH = 99,
 }
 
 local function check_popen()
@@ -53,10 +77,11 @@ do
    end
 
    local function strip_trailing_slashes()
-      if type(cfg.root_dir) == "string" then
-        cfg.root_dir = cfg.root_dir:gsub("/+$", "")
+      local cfg_root_dir = cfg.root_dir
+      if type(cfg_root_dir) == "string" then
+         cfg.root_dir = (cfg.root_dir):gsub("/+$", "")
       else
-        cfg.root_dir.root = cfg.root_dir.root:gsub("/+$", "")
+         (cfg.root_dir).root = (cfg.root_dir).root:gsub("/+$", "")
       end
       cfg.rocks_dir = cfg.rocks_dir:gsub("/+$", "")
       cfg.deploy_bin_dir = cfg.deploy_bin_dir:gsub("/+$", "")
@@ -68,7 +93,7 @@ do
       for _, tree in ipairs(cfg.rocks_trees) do
          if type(tree) == "table" and name == tree.name then
             if not tree.root then
-               return nil, "Configuration error: tree '"..tree.name.."' has no 'root' field."
+               return nil, "Configuration error: tree '" .. tree.name .. "' has no 'root' field."
             end
             replace_tree(args, tree.root, tree)
             return true
@@ -90,14 +115,14 @@ do
             local root_dir = fs.absolute_name(args.tree)
             replace_tree(args, root_dir)
             if (args.deps_mode or cfg.deps_mode) ~= "order" then
-               table.insert(cfg.rocks_trees, 1, { name = "arg", root = root_dir } )
+               table.insert(cfg.rocks_trees, 1, { name = "arg", root = root_dir })
             end
          end
       elseif args["local"] then
          if fs.is_superuser() then
-            return nil, "The --local flag is meant for operating in a user's home directory.\n"..
-               "You are running as a superuser, which is intended for system-wide operation.\n"..
-               "To force using the superuser's home, use --tree explicitly."
+            return nil, "The --local flag is meant for operating in a user's home directory.\n" ..
+            "You are running as a superuser, which is intended for system-wide operation.\n" ..
+            "To force using the superuser's home, use --tree explicitly."
          else
             local ok, err = set_named_tree(args, "user")
             if not ok then
@@ -106,12 +131,12 @@ do
          end
       elseif args.project_tree then
          local tree = args.project_tree
-         table.insert(cfg.rocks_trees, 1, { name = "project", root = tree } )
+         table.insert(cfg.rocks_trees, 1, { name = "project", root = tree })
          manif.load_rocks_tree_manifests()
          path.use_tree(tree)
       elseif project_dir then
          local project_tree = project_dir .. "/lua_modules"
-         table.insert(cfg.rocks_trees, 1, { name = "project", root = project_tree } )
+         table.insert(cfg.rocks_trees, 1, { name = "project", root = project_tree })
          manif.load_rocks_tree_manifests()
          path.use_tree(project_tree)
       elseif cfg.local_by_default then
@@ -136,13 +161,19 @@ end
 local function process_server_args(args)
    if args.server then
       local protocol, pathname = dir.split_url(args.server)
-      table.insert(cfg.rocks_servers, 1, protocol.."://"..pathname)
+      table.insert(cfg.rocks_servers, 1, protocol .. "://" .. pathname)
    end
 
    if args.dev then
-      local append_dev = function(s) return dir.path(s, "dev") end
-      local dev_servers = fun.traverse(cfg.rocks_servers, append_dev)
-      cfg.rocks_servers = fun.concat(dev_servers, cfg.rocks_servers)
+      for i, server in ipairs(cfg.rocks_servers) do
+         if type(server) == "string" then
+            cfg.rocks_servers[i] = dir.path(server, "dev")
+         else
+            for j, mirror in ipairs(server) do
+               server[j] = dir.path(mirror, "dev")
+            end
+         end
+      end
    end
 
    if args.only_server then
@@ -171,22 +202,22 @@ local function error_handler(err)
    if cfg and cfg.is_binary then
       mode = mode .. " (binary)"
    end
-   return debug.traceback("LuaRocks "..cfg.program_version..
-      " bug (please report at https://github.com/luarocks/luarocks/issues).\n"..
-      mode.."\n"..err, 2)
+   return debug.traceback("LuaRocks " .. cfg.program_version ..
+   " bug (please report at https://github.com/luarocks/luarocks/issues).\n" ..
+   mode .. "\n" .. err, 2)
 end
 
---- Display an error message and exit.
--- @param message string: The error message.
--- @param exitcode number: the exitcode to use
+
+
+
 local function die(message, exitcode)
    assert(type(message) == "string", "bad error, expected string, got: " .. type(message))
    assert(exitcode == nil or type(exitcode) == "number", "bad error, expected number, got: " .. type(exitcode) .. " - " .. tostring(exitcode))
-   util.printerr("\nError: "..message)
+   util.printerr("\nError: " .. message)
 
    local ok, err = xpcall(util.run_scheduled_functions, error_handler)
    if not ok then
-      util.printerr("\nError: "..err)
+      util.printerr("\nError: " .. err)
       exitcode = cmd.errorcodes.CRASH
    end
 
@@ -200,7 +231,7 @@ local function search_lua(lua_version, verbose, search_at)
 
    local path_sep = (package.config:sub(1, 1) == "\\" and ";" or ":")
    local all_tried = {}
-   for bindir in (os.getenv("PATH") or ""):gmatch("[^"..path_sep.."]+") do
+   for bindir in (os.getenv("PATH") or ""):gmatch("[^" .. path_sep .. "]+") do
       local searchdir = (bindir:gsub("[\\/]+bin[\\/]?$", ""))
       local detected, tried = util.find_lua(searchdir, lua_version)
       if detected then
@@ -210,9 +241,9 @@ local function search_lua(lua_version, verbose, search_at)
       end
    end
    return nil, "Could not find " ..
-               (lua_version and "Lua " .. lua_version or "Lua") ..
-               " in PATH." ..
-               (verbose and " Tried:\n" .. table.concat(all_tried, "\n") or "")
+   (lua_version and "Lua " .. lua_version or "Lua") ..
+   " in PATH." ..
+   (verbose and " Tried:\n" .. table.concat(all_tried, "\n") or "")
 end
 
 local init_config
@@ -224,7 +255,7 @@ do
             return project_tree:gsub("[/\\][^/\\]+$", ""), true
          else
             local try = "."
-            for _ = 1, 10 do -- FIXME detect when root dir was hit instead
+            for _ = 1, 10 do
                if util.exists(try .. "/.luarocks") and util.exists(try .. "/lua_modules") then
                   return dir.normalize(try), false
                elseif util.exists(try .. "/.luarocks-no-project") then
@@ -251,7 +282,7 @@ do
          table.insert(dirs, cfg.sysconfdir)
          for _, d in ipairs(dirs) do
             local f = dir.path(d, "default-lua-version.lua")
-            local mod, err = loadfile(f, "t")
+            local mod, _ = loadfile(f, "t")
             if mod then
                local pok, ver = pcall(mod)
                if pok and type(ver) == "string" and ver:match("%d+.%d+") then
@@ -267,23 +298,23 @@ do
 
       local function find_version_from_config(dirname)
          return fun.find(util.lua_versions("descending"), function(v)
-            if util.exists(dir.path(dirname, ".luarocks", "config-"..v..".lua")) then
+            if util.exists(dir.path(dirname, ".luarocks", "config-" .. v .. ".lua")) then
                return v
             end
          end)
       end
 
       local function detect_lua_via_args(args, project_dir)
-         local lua_version = args.lua_version
-                             or find_default_lua_version(args, project_dir)
-                             or (project_dir and find_version_from_config(project_dir))
+         local lua_version = args.lua_version or
+         find_default_lua_version(args, project_dir) or
+         (project_dir and find_version_from_config(project_dir))
 
          if args.lua_dir then
             local detected, err = util.find_lua(args.lua_dir, lua_version)
             if not detected then
-               local suggestion = (not args.lua_version)
-                  and "\nYou may want to specify a different Lua version with --lua-version\n"
-                  or  ""
+               local suggestion = (not args.lua_version) and
+               "\nYou may want to specify a different Lua version with --lua-version\n" or
+               ""
                die(err .. suggestion)
             end
             return detected
@@ -342,16 +373,16 @@ Variables:
 
 ]]
 
-local lua_example = package.config:sub(1, 1) == "\\"
-                    and "<d:\\path\\lua.exe>"
-                    or  "</path/lua>"
+local lua_example = package.config:sub(1, 1) == "\\" and
+"<d:\\path\\lua.exe>" or
+"</path/lua>"
 
 local function show_status(file, status, err)
-   return (file and file .. " " or "") .. (status and "(ok)" or ("(" .. (err or "not found") ..")"))
+   return (file and file .. " " or "") .. (status and "(ok)" or ("(" .. (err or "not found") .. ")"))
 end
 
 local function use_to_fix_location(key, what)
-   local buf =  "                   ****************************************\n"
+   local buf = "                   ****************************************\n"
    buf = buf .. "                   Use the command\n\n"
    buf = buf .. "                      luarocks config " .. key .. " " .. (what or "<dir>") .. "\n\n"
    buf = buf .. "                   to fix the location\n"
@@ -359,7 +390,7 @@ local function use_to_fix_location(key, what)
    return buf
 end
 
-local function get_config_text(cfg)  -- luacheck: ignore 431
+local function get_config_text(cfg)
    local deps = require("luarocks.deps")
 
    local libdir_ok = deps.check_lua_libdir(cfg.variables)
@@ -367,42 +398,42 @@ local function get_config_text(cfg)  -- luacheck: ignore 431
    local lua_ok = cfg.variables.LUA and fs.exists(cfg.variables.LUA)
 
    local buf = "Configuration:\n"
-   buf = buf.."   Lua:\n"
-   buf = buf.."      Version    : "..cfg.lua_version.."\n"
+   buf = buf .. "   Lua:\n"
+   buf = buf .. "      Version    : " .. cfg.lua_version .. "\n"
    if cfg.luajit_version then
-      buf = buf.."      LuaJIT     : "..cfg.luajit_version.."\n"
+      buf = buf .. "      LuaJIT     : " .. cfg.luajit_version .. "\n"
    end
-   buf = buf.."      LUA        : "..show_status(cfg.variables.LUA, lua_ok, "interpreter not found").."\n"
+   buf = buf .. "      LUA        : " .. show_status(cfg.variables.LUA, lua_ok, "interpreter not found") .. "\n"
    if not lua_ok then
       buf = buf .. use_to_fix_location("variables.LUA", lua_example)
    end
-   buf = buf.."      LUA_INCDIR : "..show_status(cfg.variables.LUA_INCDIR, incdir_ok, "lua.h not found").."\n"
+   buf = buf .. "      LUA_INCDIR : " .. show_status(cfg.variables.LUA_INCDIR, incdir_ok, "lua.h not found") .. "\n"
    if lua_ok and not incdir_ok then
       buf = buf .. use_to_fix_location("variables.LUA_INCDIR")
    end
-   buf = buf.."      LUA_LIBDIR : "..show_status(cfg.variables.LUA_LIBDIR, libdir_ok, "Lua library itself not found").."\n"
+   buf = buf .. "      LUA_LIBDIR : " .. show_status(cfg.variables.LUA_LIBDIR, libdir_ok, "Lua library itself not found") .. "\n"
    if lua_ok and not libdir_ok then
       buf = buf .. use_to_fix_location("variables.LUA_LIBDIR")
    end
 
-   buf = buf.."\n   Configuration files:\n"
+   buf = buf .. "\n   Configuration files:\n"
    local conf = cfg.config_files
-   buf = buf.."      System  : "..show_status(fs.absolute_name(conf.system.file), conf.system.found).."\n"
+   buf = buf .. "      System  : " .. show_status(fs.absolute_name(conf.system.file), conf.system.found) .. "\n"
    if conf.user.file then
-      buf = buf.."      User    : "..show_status(fs.absolute_name(conf.user.file), conf.user.found).."\n"
+      buf = buf .. "      User    : " .. show_status(fs.absolute_name(conf.user.file), conf.user.found) .. "\n"
    else
-      buf = buf.."      User    : disabled in this LuaRocks installation.\n"
+      buf = buf .. "      User    : disabled in this LuaRocks installation.\n"
    end
    if conf.project then
-      buf = buf.."      Project : "..show_status(fs.absolute_name(conf.project.file), conf.project.found).."\n"
+      buf = buf .. "      Project : " .. show_status(fs.absolute_name(conf.project.file), conf.project.found) .. "\n"
    end
-   buf = buf.."\n   Rocks trees in use: \n"
+   buf = buf .. "\n   Rocks trees in use: \n"
    for _, tree in ipairs(cfg.rocks_trees) do
       if type(tree) == "string" then
-         buf = buf.."      "..fs.absolute_name(tree)
+         buf = buf .. "      " .. fs.absolute_name(tree)
       else
-         local name = tree.name and " (\""..tree.name.."\")" or ""
-         buf = buf.."      "..fs.absolute_name(tree.root)..name
+         local name = tree.name and " (\"" .. tree.name .. "\")" or ""
+         buf = buf .. "      " .. fs.absolute_name(tree.root) .. name
       end
       buf = buf .. "\n"
    end
@@ -413,23 +444,23 @@ end
 local function get_parser(description, cmd_modules)
    local basename = dir.base_name(program)
    local parser = argparse(
-      basename, "LuaRocks "..cfg.program_version..", the Lua package manager\n\n"..
-      program.." - "..description, variables_help.."Run '"..basename..
-      "' without any arguments to see the configuration.")
-      :help_max_width(80)
-      :add_help_command()
-      :add_complete_command({
-         help_max_width = 100,
-         summary = "Output a shell completion script.",
-         description = [[
+   basename, "LuaRocks " .. cfg.program_version .. ", the Lua package manager\n\n" ..
+   program .. " - " .. description, variables_help .. "Run '" .. basename ..
+   "' without any arguments to see the configuration."):
+   help_max_width(80):
+   add_help_command():
+   add_complete_command({
+      help_max_width = 100,
+      summary = "Output a shell completion script.",
+      description = [[
 Output a shell completion script.
 
 Enabling completions for Bash:
 
    Add the following line to your ~/.bashrc:
-      source <(]]..basename..[[ completion bash)
+      source <(]] .. basename .. [[ completion bash)
    or save the completion script to the local completion directory:
-      ]]..basename..[[ completion bash > ~/.local/share/bash-completion/completions/]]..basename..[[
+      ]] .. basename .. [[ completion bash > ~/.local/share/bash-completion/completions/]] .. basename .. [[
 
 
 Enabling completions for Zsh:
@@ -439,61 +470,61 @@ Enabling completions for Zsh:
       fpath=(~/.zfunc $fpath)
    to your ~/.zshrc.
    Then run:
-      ]]..basename..[[ completion zsh > ~/.zfunc/_]]..basename..[[
+      ]] .. basename .. [[ completion zsh > ~/.zfunc/_]] .. basename .. [[
 
 
 Enabling completion for Fish:
 
    Add the following line to your ~/.config/fish/config.fish:
-      ]]..basename..[[ completion fish | source
+      ]] .. basename .. [[ completion fish | source
    or save the completion script to the local completion directory:
-      ]]..basename..[[ completion fish > ~/.config/fish/completions/]]..basename..[[.fish
-]]})
-      :command_target("command")
-      :require_command(false)
-
-   parser:flag("--version", "Show version info and exit.")
-      :action(function()
-         util.printout(program.." "..cfg.program_version)
-         util.printout(description)
-         util.printout()
-         os.exit(cmd.errorcodes.OK)
-      end)
-   parser:flag("--dev", "Enable the sub-repositories in rocks servers for "..
-      "rockspecs of in-development versions.")
-   parser:option("--server", "Fetch rocks/rockspecs from this server "..
-      "(takes priority over config file).")
-      :hidden_name("--from")
-   parser:option("--only-server", "Fetch rocks/rockspecs from this server only "..
-      "(overrides any entries in the config file).")
-      :argname("<server>")
-      :hidden_name("--only-from")
-   parser:option("--only-sources", "Restrict downloads to paths matching the given URL.")
-      :argname("<url>")
-      :hidden_name("--only-sources-from")
-   parser:option("--namespace", "Specify the rocks server namespace to use.")
-      :convert(string.lower)
-   parser:option("--lua-dir", "Which Lua installation to use.")
-      :argname("<prefix>")
-   parser:option("--lua-version", "Which Lua version to use.")
-      :argname("<ver>")
-      :convert(function(s) return (s:match("^%d+%.%d+$")) end)
-   parser:option("--tree", "Which tree to operate on.")
-      :hidden_name("--to")
-   parser:flag("--local", "Use the tree in the user's home directory.\n"..
-      "To enable it, see '"..program.." help path'.")
+      ]] .. basename .. [[ completion fish > ~/.config/fish/completions/]] .. basename .. [[.fish
+]], }):
+   command_target("command"):
+   require_command(false)
+
+   parser:flag("--version", "Show version info and exit."):
+   action(function()
+      util.printout(program .. " " .. cfg.program_version)
+      util.printout(description)
+      util.printout()
+      os.exit(cmd.errorcodes.OK)
+   end)
+   parser:flag("--dev", "Enable the sub-repositories in rocks servers for " ..
+   "rockspecs of in-development versions.")
+   parser:option("--server", "Fetch rocks/rockspecs from this server " ..
+   "(takes priority over config file)."):
+   hidden_name("--from")
+   parser:option("--only-server", "Fetch rocks/rockspecs from this server only " ..
+   "(overrides any entries in the config file)."):
+   argname("<server>"):
+   hidden_name("--only-from")
+   parser:option("--only-sources", "Restrict downloads to paths matching the given URL."):
+   argname("<url>"):
+   hidden_name("--only-sources-from")
+   parser:option("--namespace", "Specify the rocks server namespace to use."):
+   convert(string.lower)
+   parser:option("--lua-dir", "Which Lua installation to use."):
+   argname("<prefix>")
+   parser:option("--lua-version", "Which Lua version to use."):
+   argname("<ver>"):
+   convert(function(s) return (s:match("^%d+%.%d+$")) end)
+   parser:option("--tree", "Which tree to operate on."):
+   hidden_name("--to")
+   parser:flag("--local", "Use the tree in the user's home directory.\n" ..
+   "To enable it, see '" .. program .. " help path'.")
    parser:flag("--global", "Use the system tree when `local_by_default` is `true`.")
    parser:flag("--no-project", "Do not use project tree even if running from a project folder.")
    parser:flag("--force-lock", "Attempt to overwrite the lock for commands " ..
-      "that require exclusive access, such as 'install'")
+   "that require exclusive access, such as 'install'")
    parser:flag("--verbose", "Display verbose output of commands executed.")
-   parser:option("--timeout", "Timeout on network operations, in seconds.\n"..
-      "0 means no timeout (wait forever). Default is "..
-      tostring(cfg.connection_timeout)..".")
-      :argname("<seconds>")
-      :convert(tonumber)
+   parser:option("--timeout", "Timeout on network operations, in seconds.\n" ..
+   "0 means no timeout (wait forever). Default is " ..
+   tostring(cfg.connection_timeout) .. "."):
+   argname("<seconds>"):
+   convert(tonumber)
+
 
-   -- Used internally to force the use of a particular project tree
    parser:option("--project-tree"):hidden(true)
 
    for _, module in util.sortedpairs(cmd_modules) do
@@ -511,31 +542,31 @@ local function get_first_arg()
    local i = -1
    while arg[i] do
       first_arg = arg[i]
-      i = i -1
+      i = i - 1
    end
    return first_arg
 end
 
---- Main command-line processor.
--- Parses input arguments and calls the appropriate driver function
--- to execute the action requested on the command-line, forwarding
--- to it any additional arguments passed by the user.
--- @param description string: Short summary description of the program.
--- @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(description, commands, external_namespace, ...)
 
    check_popen()
 
-   -- Preliminary initialization
+
    cfg.init()
 
    fs.init()
 
    for _, module_name in ipairs(fs.modules(external_namespace)) do
       if not commands[module_name] then
-         commands[module_name] = external_namespace.."."..module_name
+         commands[module_name] = external_namespace .. "." .. module_name
       end
    end
 
@@ -547,15 +578,15 @@ function cmd.run_command(description, commands, external_namespace, ...)
          if original_command then
             if not mod.add_to_parser then
                mod.add_to_parser = function(parser)
-                  parser:command(name, mod.help, util.see_also())
-                        :summary(mod.help_summary)
-                        :handle_options(false)
-                        :argument("input")
-                        :args("*")
+                  parser:command(name, mod.help, util.see_also()):
+                  summary(mod.help_summary):
+                  handle_options(false):
+                  argument("input"):
+                  args("*")
                end
 
                mod.command = function(args)
-                  return original_command(args, unpack(args.input))
+                  return original_command(args, _tl_table_unpack(args.input))
                end
             end
             cmd_modules[name] = mod
@@ -563,12 +594,12 @@ function cmd.run_command(description, commands, external_namespace, ...)
             util.warning("command module " .. module .. " does not implement command(), skipping")
          end
       else
-         util.warning("failed to load command module " .. module .. ": " .. mod)
+         util.warning("failed to load command module " .. module .. ": " .. tostring(mod))
       end
    end
 
    local function process_cmdline_vars(...)
-      local args = pack(...)
+      local args = table.pack(...)
       local cmdline_vars = {}
       local last = args.n
       for i = 1, args.n do
@@ -585,7 +616,7 @@ function cmd.run_command(description, commands, external_namespace, ...)
                cmdline_vars[var] = val
                table.remove(args, i)
             else
-               die("Invalid assignment: "..arg)
+               die("Invalid assignment: " .. arg)
             end
          end
       end
@@ -595,48 +626,48 @@ function cmd.run_command(description, commands, external_namespace, ...)
 
    local args, cmdline_vars = process_cmdline_vars(...)
    local parser = get_parser(description, cmd_modules)
-   args = parser:parse(args)
+   local argsp = parser:parse(args)
+
 
-   -- Compatibility for old flag
-   if args.nodeps then
-      args.deps_mode = "none"
+   if argsp.nodeps then
+      argsp.deps_mode = "none"
    end
 
-   if args.timeout then -- setting it in the config file will kick-in earlier in the process
-      cfg.connection_timeout = args.timeout
+   if argsp.timeout then
+      cfg.connection_timeout = argsp.timeout
    end
 
-   if args.command == "config" then
-      if args.key == "lua_version" and args.value then
-         args.lua_version = args.value
-      elseif args.key == "lua_dir" and args.value then
-         args.lua_dir = args.value
+   if argsp.command == "config" then
+      if argsp.key == "lua_version" and argsp.value then
+         argsp.lua_version = argsp.value
+      elseif argsp.key == "lua_dir" and argsp.value then
+         argsp.lua_dir = argsp.value
       end
    end
 
-   -----------------------------------------------------------------------------
-   local lua_found, err = init_config(args)
+
+   local lua_found, err = init_config(argsp)
    if err then
       die(err)
    end
-   -----------------------------------------------------------------------------
 
-   -- Now that the config is fully loaded, reinitialize fs using the full
-   -- feature set.
+
+
+
    fs.init()
 
-   -- if the Lua interpreter wasn't explicitly found before cfg.init,
-   -- try again now.
+
+
    local tried
    if not lua_found then
       local detected
-      detected, tried = search_lua(cfg.lua_version, args.verbose, cfg.variables.LUA_DIR)
+      detected, tried = search_lua(cfg.lua_version, argsp.verbose, cfg.variables.LUA_DIR)
       if detected then
          lua_found = true
          cfg.variables.LUA = detected.lua
          cfg.variables.LUA_DIR = detected.lua_dir
          cfg.variables.LUA_BINDIR = detected.lua_bindir
-         if args.lua_dir then
+         if argsp.lua_dir then
             cfg.variables.LUA_INCDIR = nil
             cfg.variables.LUA_LIBDIR = nil
          end
@@ -652,10 +683,10 @@ function cmd.run_command(description, commands, external_namespace, ...)
    if lua_found then
       assert(cfg.variables.LUA)
    else
-      -- Fallback producing _some_ Lua configuration based on the running interpreter.
-      -- Most likely won't produce correct results when running from the standalone binary,
-      -- so eventually we need to drop this and outright fail if Lua is not found
-      -- or explictly configured
+
+
+
+
       if not cfg.variables.LUA then
          local first_arg = get_first_arg()
          local bin_dir = dir.dir_name(fs.absolute_name(first_arg))
@@ -678,7 +709,7 @@ function cmd.run_command(description, commands, external_namespace, ...)
       cfg.project_dir = fs.absolute_name(cfg.project_dir)
    end
 
-   if args.verbose then
+   if argsp.verbose then
       cfg.verbose = true
       print(("-"):rep(79))
       print("Current configuration:")
@@ -692,78 +723,78 @@ function cmd.run_command(description, commands, external_namespace, ...)
       die("Current directory does not exist. Please run LuaRocks from an existing directory.")
    end
 
-   local ok, err = process_tree_args(args, cfg.project_dir)
+   local ok, err = process_tree_args(argsp, cfg.project_dir)
    if not ok then
       die(err)
    end
 
-   ok, err = process_server_args(args)
+   ok, err = process_server_args(argsp)
    if not ok then
       die(err)
    end
 
-   if args.only_sources then
-      cfg.only_sources_from = args.only_sources
+   if argsp.only_sources then
+      cfg.only_sources_from = argsp.only_sources
    end
 
    for k, v in pairs(cmdline_vars) do
       cfg.variables[k] = v
    end
 
-   -- if running as superuser, use system cache dir
+
    if fs.is_superuser() then
       cfg.local_cache = dir.path(fs.system_cache_dir(), "luarocks")
    end
 
-   if args.no_manifest then
+   if argsp.no_manifest then
       cfg.no_manifest = true
    end
 
-   if not args.command then
-      parser:epilog(variables_help..get_config_text(cfg))
+   if not argsp.command then
+      parser:epilog(variables_help .. get_config_text(cfg))
       util.printout()
       util.printout(parser:get_help())
       util.printout()
       os.exit(cmd.errorcodes.OK)
    end
 
-   if not cfg.variables["LUA"] and args.command ~= "config" and args.command ~= "help" then
-      local flag = (not cfg.project_tree)
-                   and "--local "
-                   or ""
-      if args.lua_version then
-         flag = "--lua-version=" .. args.lua_version .. " " .. flag
+   if not cfg.variables["LUA"] and argsp.command ~= "config" and argsp.command ~= "help" then
+      local flag = (not cfg.project_tree) and
+      "--local " or
+      ""
+      if argsp.lua_version then
+         flag = "--lua-version=" .. argsp.lua_version .. " " .. flag
       end
       die((tried or "Lua interpreter not found.") ..
-         "\nPlease set your Lua interpreter with:\n\n" ..
-         "   luarocks " .. flag.. "config variables.LUA " .. lua_example .. "\n")
+      "\nPlease set your Lua interpreter with:\n\n" ..
+      "   luarocks " .. flag .. "config variables.LUA " .. lua_example .. "\n")
    end
 
-   local cmd_mod = cmd_modules[args.command]
+   local cmd_mod = cmd_modules[argsp.command]
 
    local lock
-   if cmd_mod.needs_lock and cmd_mod.needs_lock(args) then
-      local ok, err = fs.check_command_permissions(args)
+   if cmd_mod.needs_lock and cmd_mod.needs_lock(argsp) then
+      local ok, err = fs.check_command_permissions(argsp)
       if not ok then
          die(err, cmd.errorcodes.PERMISSIONDENIED)
       end
 
-      lock, err = fs.lock_access(path.root_dir(cfg.root_dir), args.force_lock)
+      lock, err = fs.lock_access(path.root_dir(cfg.root_dir), argsp.force_lock)
       if not lock then
-         err = args.force_lock
-               and ("failed to force the lock" .. (err and ": " .. err or ""))
-               or  (err and err ~= "File exists")
-                   and err
-                   or  "try --force-lock to overwrite the lock"
-
-         die("command '" .. args.command .. "' " ..
-             "requires exclusive write access to " .. path.root_dir(cfg.root_dir) .. " - " ..
-             err, cmd.errorcodes.LOCK)
+         err = argsp.force_lock and
+         ("failed to force the lock" .. (err and ": " .. err or "")) or
+         (err and err ~= "File exists") and
+         err or
+         "try --force-lock to overwrite the lock"
+
+         die("command '" .. argsp.command .. "' " ..
+         "requires exclusive write access to " .. path.root_dir(cfg.root_dir) .. " - " ..
+         err, cmd.errorcodes.LOCK)
       end
    end
 
    local call_ok, ok, err, exitcode = xpcall(function()
-      return cmd_mod.command(args)
+      return cmd_mod.command(argsp)
    end, error_handler)
 
    if lock then
@@ -771,7 +802,7 @@ function cmd.run_command(description, commands, external_namespace, ...)
    end
 
    if not call_ok then
-      die(ok, cmd.errorcodes.CRASH)
+      die(tostring(ok), cmd.errorcodes.CRASH)
    elseif not ok then
       die(err, exitcode)
    end
diff --git a/src/luarocks/cmd.tl b/src/luarocks/cmd.tl
index b9490e66..64abf6ce 100644
--- a/src/luarocks/cmd.tl
+++ b/src/luarocks/cmd.tl
@@ -5,7 +5,7 @@ local record cmd
 
    record Module
       add_to_parser: function(Parser)
-      command: function(Args): boolean, string
+      command: function(Args, ...: string): boolean, string, integer
       needs_lock: function(Args): boolean
       help: string
       help_summary: string
@@ -585,7 +585,7 @@ function cmd.run_command(description: string, commands: {string: string}, extern
                         :args("*")
                end
 
-               mod.command = function(args: Args): boolean, string
+               mod.command = function(args: Args): boolean, string, integer
                   return original_command(args, table.unpack(args.input))
                end
             end
@@ -594,7 +594,7 @@ function cmd.run_command(description: string, commands: {string: string}, extern
             util.warning("command module " .. module .. " does not implement command(), skipping")
          end
       else
-         util.warning("failed to load command module " .. module .. ": " .. mod)
+         util.warning("failed to load command module " .. module .. ": " .. tostring(mod))
       end
    end
 
@@ -793,7 +793,7 @@ function cmd.run_command(description: string, commands: {string: string}, extern
       end
    end
 
-   local call_ok, ok, err, exitcode = xpcall(function(): boolean, string
+   local call_ok, ok, err, exitcode = xpcall(function(): boolean, string, integer
       return cmd_mod.command(argsp)
    end, error_handler)
 
@@ -802,7 +802,7 @@ function cmd.run_command(description: string, commands: {string: string}, extern
    end
 
    if not call_ok then
-      die(ok, cmd.errorcodes.CRASH)
+      die(tostring(ok), cmd.errorcodes.CRASH)
    elseif not ok then
       die(err, exitcode)
    end
diff --git a/src/luarocks/cmd/build-original.lua b/src/luarocks/cmd/build-original.lua
new file mode 100644
index 00000000..6d719d5a
--- /dev/null
+++ b/src/luarocks/cmd/build-original.lua
@@ -0,0 +1,199 @@
+
+--- Module implementing the LuaRocks "build" command.
+-- Builds a rock, compiling its C parts if any.
+local cmd_build = {}
+
+local pack = require("luarocks.pack")
+local path = require("luarocks.path")
+local dir = require("luarocks.dir")
+local util = require("luarocks.util")
+local fetch = require("luarocks.fetch")
+local fs = require("luarocks.fs")
+local deps = require("luarocks.deps")
+local remove = require("luarocks.remove")
+local cfg = require("luarocks.core.cfg")
+local build = require("luarocks.build")
+local search = require("luarocks.search")
+local make = require("luarocks.cmd.make")
+local repos = require("luarocks.repos")
+
+function cmd_build.add_to_parser(parser)
+   local cmd = parser:command("build", "Build and install a rock, compiling its C parts if any.\n"..  -- luacheck: ignore 431
+      "If the sources contain a luarocks.lock file, uses it as an authoritative source for "..
+      "exact version of dependencies.\n"..
+      "If no arguments are given, behaves as luarocks make.", util.see_also())
+      :summary("Build/compile a rock.")
+
+   cmd:argument("rock", "A rockspec file, a source rock file, or the name of "..
+      "a rock to be fetched from a repository.")
+      :args("?")
+      :action(util.namespaced_name_action)
+   cmd:argument("version", "Rock version.")
+      :args("?")
+
+   cmd:flag("--only-deps --deps-only", "Install only the dependencies of the rock.")
+   cmd:option("--branch", "Override the `source.branch` field in the loaded "..
+      "rockspec. Allows to specify a different branch to fetch. Particularly "..
+      'for "dev" rocks.')
+      :argname("<name>")
+   cmd:flag("--pin", "Create a luarocks.lock file listing the exact "..
+      "versions of each dependency found for this rock (recursively), "..
+      "and store it in the rock's directory. "..
+      "Ignores any existing luarocks.lock file in the rock's sources.")
+   make.cmd_options(cmd)
+end
+
+--- Build and install a rock.
+-- @param rock_filename string: local or remote filename of a rock.
+-- @param opts table: build options
+-- @return boolean or (nil, string, [string]): True if build was successful,
+-- or false and an error message and an optional error code.
+local function build_rock(rock_filename, opts)
+   assert(type(rock_filename) == "string")
+
+   local cwd = fs.absolute_name(dir.path("."))
+
+   local ok, err, errcode
+
+   local unpack_dir
+   unpack_dir, err, errcode = fetch.fetch_and_unpack_rock(rock_filename, nil, opts.verify)
+   if not unpack_dir then
+      return nil, err, errcode
+   end
+
+   local rockspec_filename = path.rockspec_name_from_rock(rock_filename)
+
+   ok, err = fs.change_dir(unpack_dir)
+   if not ok then return nil, err end
+
+   local rockspec
+   rockspec, err, errcode = fetch.load_rockspec(rockspec_filename)
+   if not rockspec then
+      return nil, err, errcode
+   end
+
+   ok, err, errcode = build.build_rockspec(rockspec, opts, cwd)
+
+   fs.pop_dir()
+   return ok, err, errcode
+end
+
+local function do_build(name, namespace, version, opts)
+   assert(type(name) == "string")
+   assert(type(namespace) == "string" or not namespace)
+   assert(version == nil or type(version) == "string")
+
+   local url, err
+   if name:match("%.rockspec$") or name:match("%.rock$") then
+      url = name
+   else
+      url, err = search.find_src_or_rockspec(name, namespace, version, opts.check_lua_versions)
+      if not url then
+         return nil, err
+      end
+   end
+
+   name, version = path.parse_name(url)
+   if name and repos.is_installed(name, version) then
+      if not opts.rebuild then
+         util.printout(name .. " " .. version .. " is already installed in " .. path.root_dir(cfg.root_dir))
+         util.printout("Use --force to reinstall.")
+         return name, version, "skip"
+      end
+   end
+
+   if url:match("%.rockspec$") then
+      local cwd = fs.absolute_name(dir.path("."))
+      local rockspec, err = fetch.load_rockspec(url, nil, opts.verify)
+      if not rockspec then
+         return nil, err
+      end
+      return build.build_rockspec(rockspec, opts, cwd)
+   end
+
+   if url:match("%.src%.rock$") then
+      opts.need_to_fetch = false
+   end
+
+   return build_rock(url, opts)
+end
+
+--- Driver function for "build" command.
+-- If a package name is given, forwards the request to "search" and,
+-- if returned a result, installs the matching rock.
+-- When passing a package name, a version number may also be given.
+-- @return boolean or (nil, string, exitcode): True if build was successful; nil and an
+-- error message otherwise. exitcode is optionally returned.
+function cmd_build.command(args)
+   if not args.rock then
+      return make.command(args)
+   end
+
+   local opts = {
+      need_to_fetch = true,
+      minimal_mode = false,
+      deps_mode = deps.get_deps_mode(args),
+      build_only_deps = not not (args.only_deps and not args.pack_binary_rock),
+      namespace = args.namespace,
+      branch = args.branch,
+      verify = not not args.verify,
+      check_lua_versions = not not args.check_lua_versions,
+      pin = not not args.pin,
+      rebuild = not not (args.force or args.force_fast),
+      no_install = false
+   }
+
+   if args.sign and not args.pack_binary_rock then
+      return nil, "In the build command, --sign is meant to be used only with --pack-binary-rock"
+   end
+
+   if args.pack_binary_rock then
+      return pack.pack_binary_rock(args.rock, args.namespace, args.version, args.sign, function()
+         local name, version = do_build(args.rock, args.namespace, args.version, opts)
+         if name and args.no_doc then
+            util.remove_doc_dir(name, version)
+         end
+         return name, version
+      end)
+   end
+
+   local name, version, skip = do_build(args.rock, args.namespace, args.version, opts)
+   if not name then
+      return nil, version
+   end
+   if skip == "skip" then
+      return name, version
+   end
+
+   if args.no_doc then
+      util.remove_doc_dir(name, version)
+   end
+
+   if opts.build_only_deps then
+      util.printout("Stopping after installing dependencies for " ..name.." "..version)
+      util.printout()
+   else
+      if (not args.keep) and not cfg.keep_other_versions then
+         local ok, err, warn = remove.remove_other_versions(name, version, args.force, args.force_fast)
+         if not ok then
+            return nil, err
+         elseif warn then
+            util.printerr(err)
+         end
+      end
+   end
+
+   if opts.deps_mode ~= "none" then
+      deps.check_dependencies(nil, deps.get_deps_mode(args))
+   end
+   return name, version
+end
+
+cmd_build.needs_lock = function(args)
+   if args.pack_binary_rock then
+      return false
+   end
+   return true
+end
+
+return cmd_build
diff --git a/src/luarocks/cmd/build.lua b/src/luarocks/cmd/build.lua
index 6d719d5a..6aa3afe0 100644
--- a/src/luarocks/cmd/build.lua
+++ b/src/luarocks/cmd/build.lua
@@ -1,8 +1,10 @@
+local _tl_compat; if (tonumber((_VERSION or ''):match('[%d.]*$')) or 0) < 5.3 then local p, m = pcall(require, 'compat53.module'); if p then _tl_compat = m end end; local string = _tl_compat and _tl_compat.string or string
+
 
---- Module implementing the LuaRocks "build" command.
--- Builds a rock, compiling its C parts if any.
 local cmd_build = {}
 
+
+
 local pack = require("luarocks.pack")
 local path = require("luarocks.path")
 local dir = require("luarocks.dir")
@@ -17,39 +19,49 @@ local search = require("luarocks.search")
 local make = require("luarocks.cmd.make")
 local repos = require("luarocks.repos")
 
+local argparse = require("luarocks.vendor.argparse")
+
+
+
+
+
+
+
+
+
+
 function cmd_build.add_to_parser(parser)
-   local cmd = parser:command("build", "Build and install a rock, compiling its C parts if any.\n"..  -- luacheck: ignore 431
-      "If the sources contain a luarocks.lock file, uses it as an authoritative source for "..
-      "exact version of dependencies.\n"..
-      "If no arguments are given, behaves as luarocks make.", util.see_also())
-      :summary("Build/compile a rock.")
-
-   cmd:argument("rock", "A rockspec file, a source rock file, or the name of "..
-      "a rock to be fetched from a repository.")
-      :args("?")
-      :action(util.namespaced_name_action)
-   cmd:argument("version", "Rock version.")
-      :args("?")
+   local cmd = parser:command("build", "Build and install a rock, compiling its C parts if any.\n" ..
+   "If the sources contain a luarocks.lock file, uses it as an authoritative source for " ..
+   "exact version of dependencies.\n" ..
+   "If no arguments are given, behaves as luarocks make.", util.see_also()):
+   summary("Build/compile a rock.")
+
+   cmd:argument("rock", "A rockspec file, a source rock file, or the name of " ..
+   "a rock to be fetched from a repository."):
+   args("?"):
+   action(util.namespaced_name_action)
+   cmd:argument("version", "Rock version."):
+   args("?")
 
    cmd:flag("--only-deps --deps-only", "Install only the dependencies of the rock.")
-   cmd:option("--branch", "Override the `source.branch` field in the loaded "..
-      "rockspec. Allows to specify a different branch to fetch. Particularly "..
-      'for "dev" rocks.')
-      :argname("<name>")
-   cmd:flag("--pin", "Create a luarocks.lock file listing the exact "..
-      "versions of each dependency found for this rock (recursively), "..
-      "and store it in the rock's directory. "..
-      "Ignores any existing luarocks.lock file in the rock's sources.")
+   cmd:option("--branch", "Override the `source.branch` field in the loaded " ..
+   "rockspec. Allows to specify a different branch to fetch. Particularly " ..
+   'for "dev" rocks.'):
+   argname("<name>")
+   cmd:flag("--pin", "Create a luarocks.lock file listing the exact " ..
+   "versions of each dependency found for this rock (recursively), " ..
+   "and store it in the rock's directory. " ..
+   "Ignores any existing luarocks.lock file in the rock's sources.")
    make.cmd_options(cmd)
 end
 
---- Build and install a rock.
--- @param rock_filename string: local or remote filename of a rock.
--- @param opts table: build options
--- @return boolean or (nil, string, [string]): True if build was successful,
--- or false and an error message and an optional error code.
+
+
+
+
+
 local function build_rock(rock_filename, opts)
-   assert(type(rock_filename) == "string")
 
    local cwd = fs.absolute_name(dir.path("."))
 
@@ -72,16 +84,15 @@ local function build_rock(rock_filename, opts)
       return nil, err, errcode
    end
 
-   ok, err, errcode = build.build_rockspec(rockspec, opts, cwd)
+   local n, v = build.build_rockspec(rockspec, opts, cwd)
+
+   ok, err, errcode = n ~= nil, v, nil
 
    fs.pop_dir()
    return ok, err, errcode
 end
 
 local function do_build(name, namespace, version, opts)
-   assert(type(name) == "string")
-   assert(type(namespace) == "string" or not namespace)
-   assert(version == nil or type(version) == "string")
 
    local url, err
    if name:match("%.rockspec$") or name:match("%.rock$") then
@@ -115,15 +126,19 @@ local function do_build(name, namespace, version, opts)
       opts.need_to_fetch = false
    end
 
-   return build_rock(url, opts)
+   local ok, err, errcode = build_rock(url, opts)
+   if not ok then
+      return nil, err, errcode
+   end
+   return name, version
 end
 
---- Driver function for "build" command.
--- If a package name is given, forwards the request to "search" and,
--- if returned a result, installs the matching rock.
--- When passing a package name, a version number may also be given.
--- @return boolean or (nil, string, exitcode): True if build was successful; nil and an
--- error message otherwise. exitcode is optionally returned.
+
+
+
+
+
+
 function cmd_build.command(args)
    if not args.rock then
       return make.command(args)
@@ -140,7 +155,7 @@ function cmd_build.command(args)
       check_lua_versions = not not args.check_lua_versions,
       pin = not not args.pin,
       rebuild = not not (args.force or args.force_fast),
-      no_install = false
+      no_install = false,
    }
 
    if args.sign and not args.pack_binary_rock then
@@ -162,7 +177,7 @@ function cmd_build.command(args)
       return nil, version
    end
    if skip == "skip" then
-      return name, version
+      return name ~= nil, version
    end
 
    if args.no_doc then
@@ -170,7 +185,7 @@ function cmd_build.command(args)
    end
 
    if opts.build_only_deps then
-      util.printout("Stopping after installing dependencies for " ..name.." "..version)
+      util.printout("Stopping after installing dependencies for " .. name .. " " .. version)
       util.printout()
    else
       if (not args.keep) and not cfg.keep_other_versions then
@@ -186,7 +201,7 @@ function cmd_build.command(args)
    if opts.deps_mode ~= "none" then
       deps.check_dependencies(nil, deps.get_deps_mode(args))
    end
-   return name, version
+   return name ~= nil, version
 end
 
 cmd_build.needs_lock = function(args)
diff --git a/src/luarocks/cmd/build.tl b/src/luarocks/cmd/build.tl
index 9ec58c3e..96e2ec42 100644
--- a/src/luarocks/cmd/build.tl
+++ b/src/luarocks/cmd/build.tl
@@ -22,8 +22,7 @@ local repos = require("luarocks.repos")
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
 
-local type a = require("luarocks.core.types.args")
-local type Args = a.Args
+local type Args = require("luarocks.core.types.args").Args
 
 local type bo = require("luarocks.core.types.bopts")
 local type BOpts = bo.BOpts
@@ -85,7 +84,9 @@ local function build_rock(rock_filename: string, opts: BOpts): boolean, string,
       return nil, err, errcode
    end
 
-   ok, err, errcode = build.build_rockspec(rockspec, opts, cwd)
+   local n, v = build.build_rockspec(rockspec, opts, cwd)
+
+   ok, err, errcode = n ~= nil, v, nil
 
    fs.pop_dir()
    return ok, err, errcode
@@ -125,7 +126,11 @@ local function do_build(name: string, namespace: string, version: string, opts:
       opts.need_to_fetch = false
    end
 
-   return build_rock(url, opts)
+   local ok, err, errcode = build_rock(url, opts)
+   if not ok then
+      return nil, err, errcode
+   end
+   return name, version
 end
 
 --- Driver function for "build" command.
@@ -172,7 +177,7 @@ function cmd_build.command(args: Args): boolean, string, string
       return nil, version
    end
    if skip == "skip" then
-      return name, version
+      return name ~= nil, version
    end
 
    if args.no_doc then
@@ -196,7 +201,7 @@ function cmd_build.command(args: Args): boolean, string, string
    if opts.deps_mode ~= "none" then
       deps.check_dependencies(nil, deps.get_deps_mode(args))
    end
-   return name, version
+   return name ~= nil, version
 end
 
 cmd_build.needs_lock = function(args: Args): boolean
diff --git a/src/luarocks/cmd/install.tl b/src/luarocks/cmd/install.tl
index 40f6c782..157ef772 100644
--- a/src/luarocks/cmd/install.tl
+++ b/src/luarocks/cmd/install.tl
@@ -259,4 +259,6 @@ install.needs_lock = function(args: Args): boolean
    return true
 end
 
+deps.installer = install.command
+
 return install
diff --git a/src/luarocks/cmd/make.tl b/src/luarocks/cmd/make.tl
index f151c950..4d29c6d6 100644
--- a/src/luarocks/cmd/make.tl
+++ b/src/luarocks/cmd/make.tl
@@ -43,7 +43,7 @@ function make.cmd_options(parser: Parser)
       "built. If the rockspec or src.rock is being downloaded, LuaRocks will "..
       "attempt to download the signature as well. Otherwise, the signature "..
       "file should be already available locally in the same directory.\n"..
-      "You need the signer’s public key in your local keyring for this "..
+      "You need the signer's public key in your local keyring for this "..
       "option to work properly.")
    parser:flag("--sign", "To be used with --pack-binary-rock. Also produce a "..
       "signature file for the generated .rock file.")
diff --git a/src/luarocks/cmd/show.tl b/src/luarocks/cmd/show.tl
index 4850b3af..1d6eddda 100644
--- a/src/luarocks/cmd/show.tl
+++ b/src/luarocks/cmd/show.tl
@@ -23,23 +23,10 @@ local type Return = show.Return
 
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
-local type Option = argparse.Option
 
 local type a = require("luarocks.core.types.args")
 local type Args = a.Args
 
-local type bo = require("luarocks.core.types.bopts")
-local type BOpts = bo.BOpts
-
-local type i = require("luarocks.core.types.installs")
-local type IOpts = i.IOpts
-
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
-
-local type res = require("luarocks.core.types.result")
-local type Result = res.Result
-
 local type t = require("luarocks.core.types.tree")
 local type Tree = t.Tree
 
diff --git a/src/luarocks/cmd/upload.tl b/src/luarocks/cmd/upload.tl
index 018d9f6e..ae02fc64 100644
--- a/src/luarocks/cmd/upload.tl
+++ b/src/luarocks/cmd/upload.tl
@@ -11,36 +11,10 @@ local Api = require("luarocks.upload.api")
 
 local argparse = require("luarocks.vendor.argparse")
 local type Parser = argparse.Parser
-local type Option = argparse.Option
 
 local type a = require("luarocks.core.types.args")
 local type Args = a.Args
 
-local type bo = require("luarocks.core.types.bopts")
-local type BOpts = bo.BOpts
-
-local type i = require("luarocks.core.types.installs")
-local type IOpts = i.IOpts
-
-local type p = require("luarocks.core.types.persist")
-local type PersistableTable = p.PersistableTable
-
-local type res = require("luarocks.core.types.result")
-local type Result = res.Result
-
-local type t = require("luarocks.core.types.tree")
-local type Tree = t.Tree
-
-local type q = require("luarocks.core.types.query")
-local type Query = q.Query
-
-local type r = require("luarocks.core.types.rockspec")
-local type Rockspec = r.Rockspec
-local type Dependencies = r.Dependencies
-
-local type m = require("luarocks.core.types.manifest")
-local type Entry = m.Manifest.Entry
-
 function upload.add_to_parser(parser: Parser)
    local cmd = parser:command("upload", "Pack a source rock file (.src.rock extension) "..
       "and upload it and the rockspec to the public rocks repository.", util.see_also())
diff --git a/src/luarocks/deps.tl b/src/luarocks/deps.tl
index 1f5f24aa..58c0bd1c 100644
--- a/src/luarocks/deps.tl
+++ b/src/luarocks/deps.tl
@@ -1,6 +1,7 @@
 
 --- High-level dependency related functions.
 local record deps
+   installer: function(Args): boolean, string, string
 end
 
 local cfg = require("luarocks.core.cfg")
@@ -41,8 +42,7 @@ local type dr = require("luarocks.core.types.dir")
 local type Dir = dr.Dir
 local type Dirs = dr.Dirs
 
-local type arg = require("luarocks.core.types.args")
-local type Args = arg.Args
+local type Args = require("luarocks.core.types.args").Args
 
 --- Generate a function that matches dep queries against the manifest,
 -- taking into account rocks_provided, the list of versions to skip,
@@ -229,7 +229,6 @@ function deps.fulfill_dependency(dep: Query, deps_mode: string, rocks_provided:
    end
 
    local search = require("luarocks.search")
-   local install = require("luarocks.cmd.install")
 
    local url, search_err = search.find_suitable_rock(dep)
    if not url then
@@ -242,7 +241,7 @@ function deps.fulfill_dependency(dep: Query, deps_mode: string, rocks_provided:
       namespace = dep.namespace,
       verify = verify,
    }
-   local ok, install_err, errcode = install.command(install_args)
+   local ok, install_err, errcode = deps.installer(install_args)
    if not ok then
       return nil, "Failed installing dependency: "..url.." - "..install_err, errcode
    end
diff --git a/src/luarocks/test/busted.tl b/src/luarocks/test/busted.tl
index c0ac5503..01473f1f 100644
--- a/src/luarocks/test/busted.tl
+++ b/src/luarocks/test/busted.tl
@@ -7,6 +7,7 @@ local deps = require("luarocks.deps")
 local path = require("luarocks.path")
 local dir = require("luarocks.dir")
 local queries = require("luarocks.queries")
+local install = require("luarocks.cmd.install")
 
 local type r = require("luarocks.core.types.rockspec")
 local type Test = r.Test