Skip to content
This repository was archived by the owner on Aug 16, 2023. It is now read-only.

Fix verbose 7z output #181

Merged
merged 1 commit into from
Sep 20, 2019
Merged

Fix verbose 7z output #181

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/PlatformEngines.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,13 @@ function probe_platform_engines!(;verbose::Bool = false)
# the correct 7z given the path to the executable:
unpack_7z = (exe7z) -> begin
return (tarball_path, out_path, excludelist = nothing) ->
pipeline(`$exe7z x $(tarball_path) -y -so`,
`$exe7z x -si -y -ttar -o$(out_path) $(excludelist == nothing ? [] : "-x@$(excludelist)")`)
pipeline(pipeline(`$exe7z x $(tarball_path) -y -so`,
`$exe7z x -si -y -ttar -o$(out_path) $(excludelist == nothing ? [] : "-x@$(excludelist)")`), stdout = devnull, stderr = devnull)
end
package_7z = (exe7z) -> begin
return (in_path, tarball_path) ->
pipeline(`$exe7z a -ttar -so a.tar "$(joinpath(".",in_path,"*"))"`,
`$exe7z a -si $(tarball_path)`)
pipeline(pipeline(`$exe7z a -ttar -so a.tar "$(joinpath(".",in_path,"*"))"`,
`$exe7z a -si $(tarball_path)`), stdout = devnull, stderr = devnull)
end
list_7z = (exe7z) -> begin
return (path; verbose = false) ->
Expand Down Expand Up @@ -771,7 +771,7 @@ function unpack(tarball_path::AbstractString, dest::AbstractString;
close(io)
end
end

oc = OutputCollector(gen_unpack_cmd(tarball_path, dest, excludelist); verbose=verbose)
try
if !wait(oc)
Expand Down