From aefc0d89b093590880c8a919f842ba6a3792d7fb Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Tue, 10 Apr 2018 12:18:11 -0700
Subject: [PATCH] make gem use sudo for macOS (#6610)

gem install requires sudo on official macOS build VMs.
- make bootstrap use sudo for macOS
---
 build.psm1                                         | 11 ++++++++---
 tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 |  7 -------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/build.psm1 b/build.psm1
index 2bb5f6c243..4e85f4df63 100644
--- a/build.psm1
+++ b/build.psm1
@@ -1671,9 +1671,14 @@ function Start-PSBootstrap {
             # Install [fpm](https://github.com/jordansissel/fpm) and [ronn](https://github.com/rtomayko/ronn)
             if ($Package) {
                 try {
-                    # We cannot guess if the user wants to run gem install as root
-                    Start-NativeExecution { gem install fpm -v 1.9.3 }
-                    Start-NativeExecution { gem install ronn -v 0.7.3 }
+                    # We cannot guess if the user wants to run gem install as root on linux and windows,
+                    # but macOs usually requires sudo
+                    $gemsudo = ''
+                    if($Environment.IsMacOS) {
+                        $gemsudo = $sudo
+                    }
+                    Start-NativeExecution ([ScriptBlock]::Create("$gemsudo gem install fpm -v 1.9.3"))
+                    Start-NativeExecution ([ScriptBlock]::Create("$gemsudo gem install ronn -v 0.7.3"))
                 } catch {
                     Write-Warning "Installation of fpm and ronn gems failed! Must resolve manually."
                 }
diff --git a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
index 43acf60461..f5b7484339 100644
--- a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
+++ b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
@@ -61,13 +61,6 @@ try {
 
     if ($BootStrap.IsPresent) {
         Start-PSBootstrap -Package
-
-        # The gem install is run by bootstrap without sudo and fails on macOS.
-        # Run the commands with sudo, to resolve the issue
-        Write-Verbose -Message "Installing fpm..." -Verbose
-        Start-NativeExecution { sudo gem install fpm -v 1.8.1 }
-        Write-Verbose -Message "Installing ronn..." -Verbose
-        Start-NativeExecution { sudo gem install ronn }
     }
 
     if ($Build.IsPresent) {