Merge pull request #292 from giordano/mg/jlls

[Prefix] Use bzip2, gzip, tar, xz and zstd from JLLs

Author: vchuravy

Project.toml

@@ -4,10 +4,13 @@ authors = ["Elliot Saba <staticfloat@gmail.com>"]
 version = "1.20.0"
 
 [deps]
+Bzip2_jll = "6e34b625-4abd-537c-b88f-471c36dfa7a0"
 CodecZlib = "944b1d66-785c-5afd-91f1-9de20f533193"
 Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
+Gzip_jll = "be1be57a-8558-53c3-a7e5-50095f79957e"
 HistoricalStdlibVersions = "6df8b67a-e8a0-4029-b4b7-ac196fe72102"
 InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
+JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
 JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
 LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
 LibGit2_jll = "e37daf67-58a4-590a-8e99-b0245dd2ffc5"
@@ -23,13 +26,17 @@ Scratch = "6c6a2e73-6563-6170-7368-637461726353"
 SimpleBufferStream = "777ac1f9-54b0-4bf8-805c-2214025038e7"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 Tar = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
+Tar_jll = "9b64493d-8859-5bf3-93d7-7c32dd38186f"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
+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"
 
 [compat]
 CodecZlib = "0.5, 0.6, 0.7"
 HistoricalStdlibVersions = "0.1, 1"
+JLLWrappers = "1.4"
 JSON = "0.21"
 OrderedCollections = "1.4.1"
 OutputCollectors = "0.1"

src/Prefix.jl

@@ -3,6 +3,8 @@
 #  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
+using JLLWrappers: pathsep, LIBPATH_env
 
 export Prefix, bindir, libdirs, includedir, logdir, temp_prefix, package
 
@@ -300,7 +302,34 @@ function setup(source::SetupSource{ArchiveSource}, targetdir, verbose; tar_flags
             if verbose
                 @info "Extracting tarball $(basename(source.path))..."
             end
-            run(`tar -$(tar_flags) $(source.path)`)
+            tar = Tar_jll.is_available() ? Tar_jll.tar() : `tar`
+            # Add gzip, bzip2 & Co. to PATH.
+            path = split(get(ENV, "PATH", ""), pathsep)
+            libpath = split(get(ENV, LIBPATH_env, ""), pathsep)
+            if Tar_jll.is_available()
+                libpath = vcat(Tar_jll.LIBPATH_list, libpath)
+            end
+            if Bzip2_jll.is_available()
+                path = vcat(joinpath(Bzip2_jll.artifact_dir, "bin"), path)
+                libpath = vcat(Bzip2_jll.LIBPATH_list, libpath)
+            end
+            if Gzip_jll.is_available()
+                path = vcat(dirname(Gzip_jll.gzip_path), path)
+                libpath = vcat(Gzip_jll.LIBPATH_list, libpath)
+            end
+            if XZ_jll.is_available()
+                path = vcat(dirname(XZ_jll.xz_path), path)
+                libpath = vcat(XZ_jll.LIBPATH_list, libpath)
+            end
+            if Zstd_jll.is_available()
+                path = vcat(dirname(Zstd_jll.zstd_path), path)
+                libpath = vcat(XZ_jll.LIBPATH_list, libpath)
+            end
+            unique!(filter!(!isempty, path))
+            unique!(filter!(!isempty, libpath))
+            tar = addenv(tar, "PATH" => join(path, pathsep), LIBPATH_env => join(libpath, pathsep))
+            # Unpack the tarball
+            run(`$(tar) -$(tar_flags) $(source.path)`)
         elseif endswith(source.path, ".zip")
             if verbose
                 @info "Extracting zipball $(basename(source.path))..."