aboutsummaryrefslogtreecommitdiff
path: root/src/luarocks/install.lua
diff options
context:
space:
mode:
Diffstat (limited to 'src/luarocks/install.lua')
-rw-r--r--src/luarocks/install.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index f78c6a0d..acbf584a 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -13,6 +13,7 @@ local manif = require("luarocks.manif")
13local remove = require("luarocks.remove") 13local remove = require("luarocks.remove")
14local cfg = require("luarocks.cfg") 14local cfg = require("luarocks.cfg")
15 15
16util.add_run_function(install)
16install.help_summary = "Install a rock." 17install.help_summary = "Install a rock."
17 18
18install.help_arguments = "{<rock>|<name> [<version>]}" 19install.help_arguments = "{<rock>|<name> [<version>]}"
@@ -149,8 +150,7 @@ end
149-- may also be given. 150-- may also be given.
150-- @return boolean or (nil, string, exitcode): True if installation was 151-- @return boolean or (nil, string, exitcode): True if installation was
151-- successful, nil and an error message otherwise. exitcode is optionally returned. 152-- successful, nil and an error message otherwise. exitcode is optionally returned.
152function install.run(...) 153function install.command(flags, name, version)
153 local flags, name, version = util.parse_flags(...)
154 if type(name) ~= "string" then 154 if type(name) ~= "string" then
155 return nil, "Argument missing. "..util.see_help("install") 155 return nil, "Argument missing. "..util.see_help("install")
156 end 156 end
@@ -160,7 +160,7 @@ function install.run(...)
160 160
161 if name:match("%.rockspec$") or name:match("%.src%.rock$") then 161 if name:match("%.rockspec$") or name:match("%.src%.rock$") then
162 local build = require("luarocks.build") 162 local build = require("luarocks.build")
163 return build.run(name, util.forward_flags(flags, "local", "keep", "deps-mode", "only-deps", "force", "force-fast")) 163 return build.command(flags, name)
164 elseif name:match("%.rock$") then 164 elseif name:match("%.rock$") then
165 if flags["only-deps"] then 165 if flags["only-deps"] then
166 ok, err = install.install_binary_rock_deps(name, deps.get_deps_mode(flags)) 166 ok, err = install.install_binary_rock_deps(name, deps.get_deps_mode(flags))
@@ -181,7 +181,7 @@ function install.run(...)
181 return nil, err 181 return nil, err
182 end 182 end
183 util.printout("Installing "..url) 183 util.printout("Installing "..url)
184 return install.run(url, util.forward_flags(flags)) 184 return install.command(flags, url)
185 end 185 end
186end 186end
187 187