diff --git a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/PrepareInstall.cs b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/PrepareInstall.cs index 84837deedb4..e0fd5d49626 100644 --- a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/PrepareInstall.cs +++ b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/PrepareInstall.cs @@ -25,6 +25,7 @@ public class PrepareInstall : Task public ITaskItem DownloadUrl { get; set; } string Sudo; + string SudoBrew; public override bool Execute () { @@ -54,8 +55,9 @@ void SetSudo () if (!UseSudo || string.Equals ("Windows", HostOS, StringComparison.OrdinalIgnoreCase)) return; + Sudo = "sudo "; + if (!string.Equals ("Darwin", HostOS, StringComparison.OrdinalIgnoreCase)) { - Sudo = "sudo "; return; } string brewFilename; @@ -65,7 +67,7 @@ void SetSudo () } var brewVersion = Which.GetProgramVersion (HostOS, $"{brewPath} --version"); if (brewVersion < new Version (1, 1)) { - Sudo = "sudo "; + SudoBrew = "sudo "; return; } } @@ -101,7 +103,7 @@ void SetInstallCommand () if (string.Equals (HostOS, "Darwin", StringComparison.OrdinalIgnoreCase)) { var brew = Program.GetMetadata ("Homebrew"); if (!string.IsNullOrEmpty (brew)) { - InstallCommand = $"{Sudo}brew install '{brew}'"; + InstallCommand = $"{SudoBrew}brew install '{brew}'"; } return; }