Merge pull request #1199 from axodotdev/fix-ps1-errors

fix: handle Invoke-Installer errors
axodotdev · Jul 11, 2024 · 4f6c91a · 4f6c91a
2 parents 5eebe17 + eed524b
commit 4f6c91a
Show file tree

Hide file tree

Showing 36 changed files with 468 additions and 144 deletions.
diff --git a/cargo-dist/templates/installer/installer.ps1.j2 b/cargo-dist/templates/installer/installer.ps1.j2
@@ -92,7 +92,16 @@ function Install-Binary($install_args) {
 
   $fetched = Download "$ArtifactDownloadUrl" $platforms
   # FIXME: add a flag that lets the user not do this step
-  Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  try {
+    Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  } catch {
+    throw @"
+We encountered an error trying to perform the installation;
+please review the error messages below.
+
+$_
+"@
+  }
 }
 
 function Get-TargetTriple() {
@@ -270,15 +279,15 @@ function Invoke-Installer($bin_paths, $platforms) {
   # Just copy the binaries from the temp location to the install dir
   foreach ($bin_path in $bin_paths) {
     $installed_file = Split-Path -Path "$bin_path" -Leaf
-    Copy-Item "$bin_path" -Destination "$dest_dir"
-    Remove-Item "$bin_path" -Recurse -Force
+    Copy-Item "$bin_path" -Destination "$dest_dir" -ErrorAction Stop
+    Remove-Item "$bin_path" -Recurse -Force -ErrorAction Stop
     Write-Information "  $installed_file"
 
     if (($dests = $info["aliases"][$installed_file])) {
       $source = Join-Path "$dest_dir" "$installed_file"
       foreach ($dest_name in $dests) {
           $dest = Join-Path $dest_dir $dest_name
-          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force
+          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force -ErrorAction Stop
       }
     }
   }

diff --git a/cargo-dist/tests/snapshots/akaikatana_basic.snap b/cargo-dist/tests/snapshots/akaikatana_basic.snap
@@ -1131,7 +1131,16 @@ function Install-Binary($install_args) {
 
   $fetched = Download "$ArtifactDownloadUrl" $platforms
   # FIXME: add a flag that lets the user not do this step
-  Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  try {
+    Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  } catch {
+    throw @"
+We encountered an error trying to perform the installation;
+please review the error messages below.
+
+$_
+"@
+  }
 }
 
 function Get-TargetTriple() {
@@ -1288,15 +1297,15 @@ function Invoke-Installer($bin_paths, $platforms) {
   # Just copy the binaries from the temp location to the install dir
   foreach ($bin_path in $bin_paths) {
     $installed_file = Split-Path -Path "$bin_path" -Leaf
-    Copy-Item "$bin_path" -Destination "$dest_dir"
-    Remove-Item "$bin_path" -Recurse -Force
+    Copy-Item "$bin_path" -Destination "$dest_dir" -ErrorAction Stop
+    Remove-Item "$bin_path" -Recurse -Force -ErrorAction Stop
     Write-Information "  $installed_file"
 
     if (($dests = $info["aliases"][$installed_file])) {
       $source = Join-Path "$dest_dir" "$installed_file"
       foreach ($dest_name in $dests) {
           $dest = Join-Path $dest_dir $dest_name
-          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force
+          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force -ErrorAction Stop
       }
     }
   }

diff --git a/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap b/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap
@@ -1145,7 +1145,16 @@ function Install-Binary($install_args) {
 
   $fetched = Download "$ArtifactDownloadUrl" $platforms
   # FIXME: add a flag that lets the user not do this step
-  Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  try {
+    Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  } catch {
+    throw @"
+We encountered an error trying to perform the installation;
+please review the error messages below.
+
+$_
+"@
+  }
 }
 
 function Get-TargetTriple() {
@@ -1302,15 +1311,15 @@ function Invoke-Installer($bin_paths, $platforms) {
   # Just copy the binaries from the temp location to the install dir
   foreach ($bin_path in $bin_paths) {
     $installed_file = Split-Path -Path "$bin_path" -Leaf
-    Copy-Item "$bin_path" -Destination "$dest_dir"
-    Remove-Item "$bin_path" -Recurse -Force
+    Copy-Item "$bin_path" -Destination "$dest_dir" -ErrorAction Stop
+    Remove-Item "$bin_path" -Recurse -Force -ErrorAction Stop
     Write-Information "  $installed_file"
 
     if (($dests = $info["aliases"][$installed_file])) {
       $source = Join-Path "$dest_dir" "$installed_file"
       foreach ($dest_name in $dests) {
           $dest = Join-Path $dest_dir $dest_name
-          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force
+          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force -ErrorAction Stop
       }
     }
   }

diff --git a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap
@@ -1159,7 +1159,16 @@ function Install-Binary($install_args) {
 
   $fetched = Download "$ArtifactDownloadUrl" $platforms
   # FIXME: add a flag that lets the user not do this step
-  Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  try {
+    Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  } catch {
+    throw @"
+We encountered an error trying to perform the installation;
+please review the error messages below.
+
+$_
+"@
+  }
 }
 
 function Get-TargetTriple() {
@@ -1316,15 +1325,15 @@ function Invoke-Installer($bin_paths, $platforms) {
   # Just copy the binaries from the temp location to the install dir
   foreach ($bin_path in $bin_paths) {
     $installed_file = Split-Path -Path "$bin_path" -Leaf
-    Copy-Item "$bin_path" -Destination "$dest_dir"
-    Remove-Item "$bin_path" -Recurse -Force
+    Copy-Item "$bin_path" -Destination "$dest_dir" -ErrorAction Stop
+    Remove-Item "$bin_path" -Recurse -Force -ErrorAction Stop
     Write-Information "  $installed_file"
 
     if (($dests = $info["aliases"][$installed_file])) {
       $source = Join-Path "$dest_dir" "$installed_file"
       foreach ($dest_name in $dests) {
           $dest = Join-Path $dest_dir $dest_name
-          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force
+          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force -ErrorAction Stop
       }
     }
   }

diff --git a/cargo-dist/tests/snapshots/akaikatana_updaters.snap b/cargo-dist/tests/snapshots/akaikatana_updaters.snap
@@ -1139,7 +1139,16 @@ function Install-Binary($install_args) {
 
   $fetched = Download "$ArtifactDownloadUrl" $platforms
   # FIXME: add a flag that lets the user not do this step
-  Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  try {
+    Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  } catch {
+    throw @"
+We encountered an error trying to perform the installation;
+please review the error messages below.
+
+$_
+"@
+  }
 }
 
 function Get-TargetTriple() {
@@ -1296,15 +1305,15 @@ function Invoke-Installer($bin_paths, $platforms) {
   # Just copy the binaries from the temp location to the install dir
   foreach ($bin_path in $bin_paths) {
     $installed_file = Split-Path -Path "$bin_path" -Leaf
-    Copy-Item "$bin_path" -Destination "$dest_dir"
-    Remove-Item "$bin_path" -Recurse -Force
+    Copy-Item "$bin_path" -Destination "$dest_dir" -ErrorAction Stop
+    Remove-Item "$bin_path" -Recurse -Force -ErrorAction Stop
     Write-Information "  $installed_file"
 
     if (($dests = $info["aliases"][$installed_file])) {
       $source = Join-Path "$dest_dir" "$installed_file"
       foreach ($dest_name in $dests) {
           $dest = Join-Path $dest_dir $dest_name
-          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force
+          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force -ErrorAction Stop
       }
     }
   }

diff --git a/cargo-dist/tests/snapshots/axolotlsay_abyss.snap b/cargo-dist/tests/snapshots/axolotlsay_abyss.snap
@@ -1131,7 +1131,16 @@ function Install-Binary($install_args) {
 
   $fetched = Download "$ArtifactDownloadUrl" $platforms
   # FIXME: add a flag that lets the user not do this step
-  Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  try {
+    Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  } catch {
+    throw @"
+We encountered an error trying to perform the installation;
+please review the error messages below.
+
+$_
+"@
+  }
 }
 
 function Get-TargetTriple() {
@@ -1288,15 +1297,15 @@ function Invoke-Installer($bin_paths, $platforms) {
   # Just copy the binaries from the temp location to the install dir
   foreach ($bin_path in $bin_paths) {
     $installed_file = Split-Path -Path "$bin_path" -Leaf
-    Copy-Item "$bin_path" -Destination "$dest_dir"
-    Remove-Item "$bin_path" -Recurse -Force
+    Copy-Item "$bin_path" -Destination "$dest_dir" -ErrorAction Stop
+    Remove-Item "$bin_path" -Recurse -Force -ErrorAction Stop
     Write-Information "  $installed_file"
 
     if (($dests = $info["aliases"][$installed_file])) {
       $source = Join-Path "$dest_dir" "$installed_file"
       foreach ($dest_name in $dests) {
           $dest = Join-Path $dest_dir $dest_name
-          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force
+          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force -ErrorAction Stop
       }
     }
   }

diff --git a/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap b/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap
@@ -1131,7 +1131,16 @@ function Install-Binary($install_args) {
 
   $fetched = Download "$ArtifactDownloadUrl" $platforms
   # FIXME: add a flag that lets the user not do this step
-  Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  try {
+    Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  } catch {
+    throw @"
+We encountered an error trying to perform the installation;
+please review the error messages below.
+
+$_
+"@
+  }
 }
 
 function Get-TargetTriple() {
@@ -1288,15 +1297,15 @@ function Invoke-Installer($bin_paths, $platforms) {
   # Just copy the binaries from the temp location to the install dir
   foreach ($bin_path in $bin_paths) {
     $installed_file = Split-Path -Path "$bin_path" -Leaf
-    Copy-Item "$bin_path" -Destination "$dest_dir"
-    Remove-Item "$bin_path" -Recurse -Force
+    Copy-Item "$bin_path" -Destination "$dest_dir" -ErrorAction Stop
+    Remove-Item "$bin_path" -Recurse -Force -ErrorAction Stop
     Write-Information "  $installed_file"
 
     if (($dests = $info["aliases"][$installed_file])) {
       $source = Join-Path "$dest_dir" "$installed_file"
       foreach ($dest_name in $dests) {
           $dest = Join-Path $dest_dir $dest_name
-          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force
+          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force -ErrorAction Stop
       }
     }
   }

diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias.snap b/cargo-dist/tests/snapshots/axolotlsay_alias.snap
@@ -1145,7 +1145,16 @@ function Install-Binary($install_args) {
 
   $fetched = Download "$ArtifactDownloadUrl" $platforms
   # FIXME: add a flag that lets the user not do this step
-  Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  try {
+    Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  } catch {
+    throw @"
+We encountered an error trying to perform the installation;
+please review the error messages below.
+
+$_
+"@
+  }
 }
 
 function Get-TargetTriple() {
@@ -1302,15 +1311,15 @@ function Invoke-Installer($bin_paths, $platforms) {
   # Just copy the binaries from the temp location to the install dir
   foreach ($bin_path in $bin_paths) {
     $installed_file = Split-Path -Path "$bin_path" -Leaf
-    Copy-Item "$bin_path" -Destination "$dest_dir"
-    Remove-Item "$bin_path" -Recurse -Force
+    Copy-Item "$bin_path" -Destination "$dest_dir" -ErrorAction Stop
+    Remove-Item "$bin_path" -Recurse -Force -ErrorAction Stop
     Write-Information "  $installed_file"
 
     if (($dests = $info["aliases"][$installed_file])) {
       $source = Join-Path "$dest_dir" "$installed_file"
       foreach ($dest_name in $dests) {
           $dest = Join-Path $dest_dir $dest_name
-          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force
+          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force -ErrorAction Stop
       }
     }
   }

diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap b/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap
@@ -1145,7 +1145,16 @@ function Install-Binary($install_args) {
 
   $fetched = Download "$ArtifactDownloadUrl" $platforms
   # FIXME: add a flag that lets the user not do this step
-  Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  try {
+    Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  } catch {
+    throw @"
+We encountered an error trying to perform the installation;
+please review the error messages below.
+
+$_
+"@
+  }
 }
 
 function Get-TargetTriple() {
@@ -1302,15 +1311,15 @@ function Invoke-Installer($bin_paths, $platforms) {
   # Just copy the binaries from the temp location to the install dir
   foreach ($bin_path in $bin_paths) {
     $installed_file = Split-Path -Path "$bin_path" -Leaf
-    Copy-Item "$bin_path" -Destination "$dest_dir"
-    Remove-Item "$bin_path" -Recurse -Force
+    Copy-Item "$bin_path" -Destination "$dest_dir" -ErrorAction Stop
+    Remove-Item "$bin_path" -Recurse -Force -ErrorAction Stop
     Write-Information "  $installed_file"
 
     if (($dests = $info["aliases"][$installed_file])) {
       $source = Join-Path "$dest_dir" "$installed_file"
       foreach ($dest_name in $dests) {
           $dest = Join-Path $dest_dir $dest_name
-          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force
+          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force -ErrorAction Stop
       }
     }
   }

diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_basic.snap
@@ -1131,7 +1131,16 @@ function Install-Binary($install_args) {
 
   $fetched = Download "$ArtifactDownloadUrl" $platforms
   # FIXME: add a flag that lets the user not do this step
-  Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  try {
+    Invoke-Installer -bin_paths $fetched -platforms $platforms "$install_args"
+  } catch {
+    throw @"
+We encountered an error trying to perform the installation;
+please review the error messages below.
+
+$_
+"@
+  }
 }
 
 function Get-TargetTriple() {
@@ -1288,15 +1297,15 @@ function Invoke-Installer($bin_paths, $platforms) {
   # Just copy the binaries from the temp location to the install dir
   foreach ($bin_path in $bin_paths) {
     $installed_file = Split-Path -Path "$bin_path" -Leaf
-    Copy-Item "$bin_path" -Destination "$dest_dir"
-    Remove-Item "$bin_path" -Recurse -Force
+    Copy-Item "$bin_path" -Destination "$dest_dir" -ErrorAction Stop
+    Remove-Item "$bin_path" -Recurse -Force -ErrorAction Stop
     Write-Information "  $installed_file"
 
     if (($dests = $info["aliases"][$installed_file])) {
       $source = Join-Path "$dest_dir" "$installed_file"
       foreach ($dest_name in $dests) {
           $dest = Join-Path $dest_dir $dest_name
-          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force
+          $null = New-Item -ItemType HardLink -Target "$source" -Path "$dest" -Force -ErrorAction Stop
       }
     }
   }