From d6abf6c245752aaaef65b03d3dee2e57ecef0107 Mon Sep 17 00:00:00 2001 From: Zanie Blue Date: Fri, 8 Nov 2024 15:01:58 -0600 Subject: [PATCH] Use `$HOME` instead of `$env:HOME` when constructing default Cargo home path --- cargo-dist/templates/installer/installer.ps1.j2 | 2 +- cargo-dist/tests/snapshots/akaikatana_basic.snap | 2 +- .../snapshots/akaikatana_one_alias_among_many_binaries.snap | 2 +- cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap | 2 +- cargo-dist/tests/snapshots/akaikatana_updaters.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_abyss.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_alias.snap | 2 +- .../snapshots/axolotlsay_alias_ignores_missing_bins.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_basic.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap | 2 +- .../tests/snapshots/axolotlsay_disable_source_tarball.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap | 2 +- .../tests/snapshots/axolotlsay_generic_workspace_basic.snap | 4 ++-- cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap | 2 +- .../tests/snapshots/axolotlsay_no_homebrew_publish.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap | 2 +- .../tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap | 2 +- .../snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_updaters.snap | 2 +- .../tests/snapshots/axolotlsay_user_global_build_job.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap | 2 +- .../tests/snapshots/axolotlsay_user_local_build_job.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap | 2 +- cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap | 2 +- cargo-dist/tests/snapshots/install_path_cargo_home.snap | 2 +- cargo-dist/tests/snapshots/install_path_env_no_subdir.snap | 2 +- cargo-dist/tests/snapshots/install_path_env_subdir.snap | 2 +- cargo-dist/tests/snapshots/install_path_env_subdir_space.snap | 2 +- .../tests/snapshots/install_path_env_subdir_space_deeper.snap | 2 +- .../tests/snapshots/install_path_fallback_no_env_var_set.snap | 2 +- .../tests/snapshots/install_path_home_subdir_deeper.snap | 2 +- cargo-dist/tests/snapshots/install_path_home_subdir_min.snap | 2 +- .../tests/snapshots/install_path_home_subdir_space.snap | 2 +- .../snapshots/install_path_home_subdir_space_deeper.snap | 2 +- .../tests/snapshots/install_path_no_fallback_taken.snap | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/cargo-dist/templates/installer/installer.ps1.j2 b/cargo-dist/templates/installer/installer.ps1.j2 index d3d628ba1..5a857e3bb 100644 --- a/cargo-dist/templates/installer/installer.ps1.j2 +++ b/cargo-dist/templates/installer/installer.ps1.j2 @@ -311,7 +311,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/akaikatana_basic.snap b/cargo-dist/tests/snapshots/akaikatana_basic.snap index 8cc9ec4b0..829291bd6 100644 --- a/cargo-dist/tests/snapshots/akaikatana_basic.snap +++ b/cargo-dist/tests/snapshots/akaikatana_basic.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" 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 index 33a613822..a6061caa7 100644 --- a/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap +++ b/cargo-dist/tests/snapshots/akaikatana_one_alias_among_many_binaries.snap @@ -1691,7 +1691,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap index c645107f6..e68a06684 100644 --- a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap +++ b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap @@ -1717,7 +1717,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/akaikatana_updaters.snap b/cargo-dist/tests/snapshots/akaikatana_updaters.snap index 5e302339f..8dab9f249 100644 --- a/cargo-dist/tests/snapshots/akaikatana_updaters.snap +++ b/cargo-dist/tests/snapshots/akaikatana_updaters.snap @@ -1669,7 +1669,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_abyss.snap b/cargo-dist/tests/snapshots/axolotlsay_abyss.snap index ccf3ddb01..1feaf92c5 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_abyss.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_abyss.snap @@ -1644,7 +1644,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap b/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap index 7f6ece7ee..95ad6316c 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap @@ -1644,7 +1644,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias.snap b/cargo-dist/tests/snapshots/axolotlsay_alias.snap index ce0ad3d08..a7d2e574a 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_alias.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_alias.snap @@ -1691,7 +1691,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap b/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap index 13abb2d6c..b4f0eb193 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap @@ -1695,7 +1695,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_basic.snap index 45a63040a..f577edae2 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap b/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap index 0c951ee8f..564fce146 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap @@ -1664,7 +1664,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap b/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap index dc536cf7d..6c6c04916 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap b/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap index 6e7e3c015..99613d697 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_disable_source_tarball.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap b/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap index 5aabf3c06..bc34894c4 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_dist_url_override.snap @@ -1596,7 +1596,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap b/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap index d754fdcf0..00909096c 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_edit_existing.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap index 0e2cfa718..6042d34db 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_generic_workspace_basic.snap @@ -1660,7 +1660,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" @@ -3577,7 +3577,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap b/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap index 2b9b014b5..a79a74ae2 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_homebrew_packages.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap b/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap index 4c68d91a2..0713047f7 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_no_homebrew_publish.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap b/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap index 7bf380aad..436c20c1a 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_several_aliases.snap @@ -1695,7 +1695,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap index 39e62eaef..4900123e5 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign.snap @@ -1596,7 +1596,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap index 39e62eaef..4900123e5 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_ssldotcom_windows_sign_prod.snap @@ -1596,7 +1596,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_updaters.snap b/cargo-dist/tests/snapshots/axolotlsay_updaters.snap index cec91f75b..fc28b9f17 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_updaters.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_updaters.snap @@ -1669,7 +1669,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap index 2a3ef5d99..929600bb3 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_global_build_job.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap index 70cab7d23..46e7ecba6 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_host_job.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap index d67c3e868..20cbe8037 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_local_build_job.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap index 00ef15ab7..9f5ed9e23 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_plan_job.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap b/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap index 8bb1473e9..29f146714 100644 --- a/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap +++ b/cargo-dist/tests/snapshots/axolotlsay_user_publish_job.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/install_path_cargo_home.snap b/cargo-dist/tests/snapshots/install_path_cargo_home.snap index 28799d6dd..8ae274077 100644 --- a/cargo-dist/tests/snapshots/install_path_cargo_home.snap +++ b/cargo-dist/tests/snapshots/install_path_cargo_home.snap @@ -1661,7 +1661,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap b/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap index 76d13c94e..6c03478ee 100644 --- a/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap +++ b/cargo-dist/tests/snapshots/install_path_env_no_subdir.snap @@ -1644,7 +1644,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/install_path_env_subdir.snap b/cargo-dist/tests/snapshots/install_path_env_subdir.snap index 9d076bc8b..d06fba007 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir.snap @@ -1644,7 +1644,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap b/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap index 6132c45a9..299a23b1c 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir_space.snap @@ -1644,7 +1644,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap b/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap index d6a8bc44e..f560aadcd 100644 --- a/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap +++ b/cargo-dist/tests/snapshots/install_path_env_subdir_space_deeper.snap @@ -1644,7 +1644,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap b/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap index 0b156c439..e3923f989 100644 --- a/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap +++ b/cargo-dist/tests/snapshots/install_path_fallback_no_env_var_set.snap @@ -1658,7 +1658,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap index 636336c7b..8363d7e03 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_deeper.snap @@ -1644,7 +1644,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap index 4ea4ab243..ddd375825 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_min.snap @@ -1644,7 +1644,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap index cc4a73fe9..58fa3994d 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_space.snap @@ -1644,7 +1644,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap b/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap index 4d5bed4d0..cceae8948 100644 --- a/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap +++ b/cargo-dist/tests/snapshots/install_path_home_subdir_space_deeper.snap @@ -1644,7 +1644,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home" diff --git a/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap b/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap index 9f737a81f..b786d14b4 100644 --- a/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap +++ b/cargo-dist/tests/snapshots/install_path_no_fallback_taken.snap @@ -1658,7 +1658,7 @@ function Invoke-Installer($artifacts, $platforms) { # `\` so we normalize for comparison. We don't use `Resolve-Path` because they # may not exist. $cargo_home = if ($env:CARGO_HOME) { $env:CARGO_HOME } else { - Join-Path $(if ($env:HOME) { $env:HOME } else { "" }) ".cargo" + Join-Path $(if ($HOME) { $HOME } else { "" }) ".cargo" } if ($force_install_dir.Replace('\\', '\') -eq $cargo_home) { $install_layout = "cargo-home"