diff options
| author | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-09-19 00:06:42 +0200 |
|---|---|---|
| committer | Thijs Schreijer <thijs@thijsschreijer.nl> | 2013-09-19 00:06:42 +0200 |
| commit | 3d55785c564890a49cf60a0fc4eb147acdde7e2b (patch) | |
| tree | 2eae40a3d01e10f2a51ee0491ce8ebaaa8d5b8b2 | |
| parent | 5e1bc7d01b0cad40f718d850faf3520afd8644a8 (diff) | |
| download | luarocks-3d55785c564890a49cf60a0fc4eb147acdde7e2b.tar.gz luarocks-3d55785c564890a49cf60a0fc4eb147acdde7e2b.tar.bz2 luarocks-3d55785c564890a49cf60a0fc4eb147acdde7e2b.zip | |
downloading caused some output to appear, by wget.exe, this fix removes that output
| -rw-r--r-- | src/luarocks/fs/win32/tools.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua index 7bb69d9e..73798cbe 100644 --- a/src/luarocks/fs/win32/tools.lua +++ b/src/luarocks/fs/win32/tools.lua | |||
| @@ -269,10 +269,11 @@ function download(url, filename) | |||
| 269 | if cfg.downloader == "wget" then | 269 | if cfg.downloader == "wget" then |
| 270 | local wget_cmd = vars.WGET.." --no-check-certificate --no-cache --user-agent=\""..cfg.user_agent.." via wget\" --quiet --continue " | 270 | local wget_cmd = vars.WGET.." --no-check-certificate --no-cache --user-agent=\""..cfg.user_agent.." via wget\" --quiet --continue " |
| 271 | if filename then | 271 | if filename then |
| 272 | return fs.execute(wget_cmd.." --output-document ", filename, url) | 272 | wget_cmd = wget_cmd.." --output-document "..fs.Q(filename).." "..fs.Q(url) |
| 273 | else | 273 | else |
| 274 | return fs.execute(wget_cmd, url) | 274 | wget_cmd = wget_cmd.." "..fs.Q(url) |
| 275 | end | 275 | end |
| 276 | return fs.execute(wget_cmd.." 2> NUL 1> NUL") | ||
| 276 | elseif cfg.downloader == "curl" then | 277 | elseif cfg.downloader == "curl" then |
| 277 | filename = filename or dir.base_name(url) | 278 | filename = filename or dir.base_name(url) |
| 278 | return fs.execute_string(vars.CURL.." -L --user-agent \""..cfg.user_agent.." via curl\" "..fs.Q(url).." 2> NUL 1> "..fs.Q(filename)) | 279 | return fs.execute_string(vars.CURL.." -L --user-agent \""..cfg.user_agent.." via curl\" "..fs.Q(url).." 2> NUL 1> "..fs.Q(filename)) |