[Prefix] Use unzip from unzip_jll (#335)

Author: giordano

Project.toml

@@ -34,6 +34,7 @@ XZ_jll = "ffd25f8a-64ca-5728-b0f7-c24cf3aae800"
 Zstd_jll = "3161d3a3-bdf6-5164-811a-617609db77b4"
 p7zip_jll = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
 pigz_jll = "1bc43ea1-30af-5bc8-a9d4-c018457e6e3e"
+unzip_jll = "88f77b66-78eb-5ed0-bc16-ebba0796830d"
 
 [compat]
 CodecZlib = "0.5, 0.6, 0.7"
@@ -46,4 +47,5 @@ ProgressMeter = "1"
 Scratch = "1.0"
 SimpleBufferStream = "1"
 Tar = "1.7"
+unzip_jll = "6.0.2"
 julia = "1.7"

src/Prefix.jl

@@ -3,7 +3,7 @@
 #  environment variables must be updated to, etc...
 import Base: convert, joinpath, show
 using SHA, CodecZlib, TOML, LibGit2_jll
-import Bzip2_jll, Gzip_jll, Tar_jll, XZ_jll, Zstd_jll
+import Bzip2_jll, Gzip_jll, Tar_jll, XZ_jll, Zstd_jll, unzip_jll
 using JLLWrappers: pathsep, LIBPATH_env
 
 export Prefix, bindir, libdirs, includedir, logdir, temp_prefix, package
@@ -294,9 +294,6 @@ end
 
 function setup(source::SetupSource{ArchiveSource}, targetdir, verbose; tar_flags = verbose ? "xvof" : "xof")
     mkpath(targetdir)
-    # Extract with host tools because it is _much_ faster on e.g. OSX.
-    # If this becomes a compatibility problem, we'll just have to install
-    # our own `tar` and `unzip` through BP as dependencies for BB.
     cd(targetdir) do
         if any(endswith(source.path, ext) for ext in tar_extensions)
             if verbose
@@ -334,7 +331,9 @@ function setup(source::SetupSource{ArchiveSource}, targetdir, verbose; tar_flags
             if verbose
                 @info "Extracting zipball $(basename(source.path))..."
             end
-            run(`unzip -q $(source.path)`)
+            if unzip_jll.is_available()
+                run(`$(unzip_jll.unzip()) -q $(source.path)`)
+            end
         elseif endswith(source.path, ".conda")
             if verbose
                 @info "Extracting conda package $(basename(source.path))..."
@@ -343,7 +342,9 @@ function setup(source::SetupSource{ArchiveSource}, targetdir, verbose; tar_flags
             # Replace initial hash with pkg, and change the file extension to obtain the name
             pkg_name = replace(basename(source.path), r"^[a-z0-9]{64}-" => "pkg-", ".conda" => ".tar.zst")
             # First unzip the pkg tarball from .conda file
-            run(`unzip -q $(source.path) $pkg_name`)
+            if unzip_jll.is_available()
+                run(`$(unzip_jll.unzip()) -q $(source.path) $(pkg_name)`)
+            end
             # Second untar the pkg tarball
             pkg_source = SetupSource{ArchiveSource}(joinpath(targetdir, pkg_name), source.hash, source.target)
             # Run setup again to untar the pkg binaries