diff options
Diffstat (limited to 'src/luarocks/install.lua')
-rw-r--r-- | src/luarocks/install.lua | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua index 6d457fc2..c938aa9f 100644 --- a/src/luarocks/install.lua +++ b/src/luarocks/install.lua | |||
@@ -186,20 +186,12 @@ function install.run(...) | |||
186 | return name, version | 186 | return name, version |
187 | else | 187 | else |
188 | local search = require("luarocks.search") | 188 | local search = require("luarocks.search") |
189 | local results, err = search.find_suitable_rock(search.make_query(name:lower(), version)) | 189 | local url, err = search.find_suitable_rock(search.make_query(name:lower(), version)) |
190 | if err then | 190 | if not url then |
191 | return nil, err | 191 | return nil, err |
192 | elseif type(results) == "string" then | ||
193 | local url = results | ||
194 | util.printout("Installing "..url.."...") | ||
195 | return install.run(url, util.forward_flags(flags)) | ||
196 | else | ||
197 | util.printout() | ||
198 | util.printerr("Could not determine which rock to install.") | ||
199 | util.title("Search results:") | ||
200 | search.print_results(results) | ||
201 | return nil, (next(results) and "Please narrow your query." or "No results found.") | ||
202 | end | 192 | end |
193 | util.printout("Installing "..url.."...") | ||
194 | return install.run(url, util.forward_flags(flags)) | ||
203 | end | 195 | end |
204 | end | 196 | end |
205 | 197 | ||