From 748e1c4f2e586c07f2da8c3906a9b99234a2276c Mon Sep 17 00:00:00 2001 From: junglebus <22320807+junglebus@users.noreply.github.com> Date: Sun, 12 Jan 2020 05:05:13 +1100 Subject: [PATCH] No need to install Tar now (#6919) Latest version of msys2 includes tar, so no need to manually install it --- build.cake | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/build.cake b/build.cake index ea0dd1c76..27ca52bf5 100644 --- a/build.cake +++ b/build.cake @@ -147,7 +147,7 @@ Task("Package-Mono-Full-Framework") DeleteFile(buildOutputPath + "/System.Runtime.InteropServices.RuntimeInformation.dll"); - InstallMsysTar(); + CheckForGzipAndTar(); Gzip("./BuildOutput/net461/linux-x64", $"./{artifactsDirName}", "Jackett", "Jackett.Binaries.Mono.tar.gz"); }); @@ -437,20 +437,8 @@ private void Gzip(string sourceFolder, string outputDirectory, string tarCdirect } } -private void InstallMsysTar() +private void CheckForGzipAndTar() { - //Gzip is included by default with MSYS2, but not tar. Use the package manager to install tar - - var startInfo = new System.Diagnostics.ProcessStartInfo() - { - Arguments = "-S --noconfirm tar", - FileName = @"C:\msys64\usr\bin\pacman.exe", - UseShellExecute = false - }; - - var process = System.Diagnostics.Process.Start(startInfo); - process.WaitForExit(); - if (FileExists(@"C:\msys64\usr\bin\tar.exe") && FileExists(@"C:\msys64\usr\bin\gzip.exe")) { Information("tar.exe and gzip.exe were found");