From d60b27a0f6ff41ebb52c0c97fcb1165d107d1744 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 19 Feb 2021 10:56:25 -0800 Subject: [PATCH 1/3] Fix install-dotnet download --- build.psm1 | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build.psm1 b/build.psm1 index 76f14041536..6411acd9209 100644 --- a/build.psm1 +++ b/build.psm1 @@ -1678,7 +1678,6 @@ function Install-Dotnet { # Install for Linux and OS X if ($environment.IsLinux -or $environment.IsMacOS) { - $curl = Get-Command -Name curl -CommandType Application -TotalCount 1 -ErrorAction Stop # Uninstall all previous dotnet packages $uninstallScript = if ($environment.IsLinux -and $environment.IsUbuntu) { @@ -1689,7 +1688,7 @@ function Install-Dotnet { if ($uninstallScript) { Start-NativeExecution { - & $curl -sO $uninstallObtainUrl/uninstall/$uninstallScript + Invoke-WebRequest -Uri $uninstallObtainUrl/uninstall/$uninstallScript -OutFile "/$uninstallScript" Invoke-Expression "$sudo bash ./$uninstallScript" } } else { @@ -1699,7 +1698,12 @@ function Install-Dotnet { # Install new dotnet 1.1.0 preview packages $installScript = "dotnet-install.sh" Start-NativeExecution { - & $curl -sO $installObtainUrl/$installScript + Write-Verbose -Message "downloading install script from $installObtainUrl/$installScript ..." -Verbose + Invoke-WebRequest -Uri $installObtainUrl/$installScript -OutFile "./$installScript" + + if ((Get-ChildItem "./$installScript").Length -eq 0) { + throw "./$installScript was 0 length" + } $bashArgs = @("./$installScript", '-c', $Channel, '-v', $Version) From 77a29c82c8f58961453efa0df6ba84f55cbc90a7 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 19 Feb 2021 11:04:21 -0800 Subject: [PATCH 2/3] Revert "Fix install-dotnet download" This reverts commit d60b27a0f6ff41ebb52c0c97fcb1165d107d1744. --- build.psm1 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.psm1 b/build.psm1 index 6411acd9209..39b637eb365 100644 --- a/build.psm1 +++ b/build.psm1 @@ -1678,6 +1678,7 @@ function Install-Dotnet { # Install for Linux and OS X if ($environment.IsLinux -or $environment.IsMacOS) { + $curl = Get-Command -Name curl -CommandType Application -TotalCount 1 -ErrorAction Stop # Uninstall all previous dotnet packages $uninstallScript = if ($environment.IsLinux -and $environment.IsUbuntu) { @@ -1688,7 +1689,7 @@ function Install-Dotnet { if ($uninstallScript) { Start-NativeExecution { - Invoke-WebRequest -Uri $uninstallObtainUrl/uninstall/$uninstallScript -OutFile "/$uninstallScript" + & $curl -sO $uninstallObtainUrl/uninstall/$uninstallScript Invoke-Expression "$sudo bash ./$uninstallScript" } } else { @@ -1699,11 +1700,11 @@ function Install-Dotnet { $installScript = "dotnet-install.sh" Start-NativeExecution { Write-Verbose -Message "downloading install script from $installObtainUrl/$installScript ..." -Verbose - Invoke-WebRequest -Uri $installObtainUrl/$installScript -OutFile "./$installScript" if ((Get-ChildItem "./$installScript").Length -eq 0) { throw "./$installScript was 0 length" } + & $curl -sO $installObtainUrl/$installScript $bashArgs = @("./$installScript", '-c', $Channel, '-v', $Version) From e3db525086bcb0ee344bf671bd9bd205f3e0c80c Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 19 Feb 2021 11:13:38 -0800 Subject: [PATCH 3/3] change to wget --- build.psm1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.psm1 b/build.psm1 index 39b637eb365..48ee8809303 100644 --- a/build.psm1 +++ b/build.psm1 @@ -1678,7 +1678,7 @@ function Install-Dotnet { # Install for Linux and OS X if ($environment.IsLinux -or $environment.IsMacOS) { - $curl = Get-Command -Name curl -CommandType Application -TotalCount 1 -ErrorAction Stop + $wget = Get-Command -Name wget -CommandType Application -TotalCount 1 -ErrorAction Stop # Uninstall all previous dotnet packages $uninstallScript = if ($environment.IsLinux -and $environment.IsUbuntu) { @@ -1689,7 +1689,7 @@ function Install-Dotnet { if ($uninstallScript) { Start-NativeExecution { - & $curl -sO $uninstallObtainUrl/uninstall/$uninstallScript + & $wget $uninstallObtainUrl/uninstall/$uninstallScript Invoke-Expression "$sudo bash ./$uninstallScript" } } else { @@ -1700,11 +1700,11 @@ function Install-Dotnet { $installScript = "dotnet-install.sh" Start-NativeExecution { Write-Verbose -Message "downloading install script from $installObtainUrl/$installScript ..." -Verbose + & $wget $installObtainUrl/$installScript if ((Get-ChildItem "./$installScript").Length -eq 0) { throw "./$installScript was 0 length" } - & $curl -sO $installObtainUrl/$installScript $bashArgs = @("./$installScript", '-c', $Channel, '-v', $Version)