From 6fc4b35d4e89e83e15c47d0163c3ced47f236b7d Mon Sep 17 00:00:00 2001 From: mpeterv Date: Thu, 14 Apr 2016 19:53:12 +0300 Subject: Fix loud archive unpacking In luarocks.fs.unix.tools.unpack_archive execute commands in quiet mode (that is, silenced by default, but not with --verbose), like in luarocks.fs.unzip and luarocks.fs.win32.tools.unpack_archive. --- src/luarocks/fs/unix/tools.lua | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua index fed9c426..767bae4d 100644 --- a/src/luarocks/fs/unix/tools.lua +++ b/src/luarocks/fs/unix/tools.lua @@ -293,13 +293,19 @@ end function tools.unpack_archive(archive) assert(type(archive) == "string") + local pipe_to_tar = " | "..vars.TAR.." -xf -" + + if not cfg.verbose then + pipe_to_tar = " 2> /dev/null"..fs.quiet(pipe_to_tar) + end + local ok if archive:match("%.tar%.gz$") or archive:match("%.tgz$") then - ok = fs.execute_string(vars.GUNZIP.." -c "..fs.Q(archive).." | "..vars.TAR.." -xf -") + ok = fs.execute_string(vars.GUNZIP.." -c "..fs.Q(archive)..pipe_to_tar) elseif archive:match("%.tar%.bz2$") then - ok = fs.execute_string(vars.BUNZIP2.." -c "..fs.Q(archive).." | "..vars.TAR.." -xf -") + ok = fs.execute_string(vars.BUNZIP2.." -c "..fs.Q(archive)..pipe_to_tar) elseif archive:match("%.zip$") then - ok = fs.execute(vars.UNZIP, archive) + ok = fs.execute_quiet(vars.UNZIP, archive) elseif archive:match("%.lua$") or archive:match("%.c$") then -- Ignore .lua and .c files; they don't need to be extracted. return true -- cgit v1.2.3-55-g6feb