feat: move ps1 NoModifyPath to env

axodotdev · Sep 16, 2024 · b2cf35c · b2cf35c
1 parent 20f4c94
commit b2cf35c
Show file tree

Hide file tree

Showing 37 changed files with 228 additions and 190 deletions.
diff --git a/cargo-dist/templates/installer/installer.ps1.j2 b/cargo-dist/templates/installer/installer.ps1.j2
@@ -30,9 +30,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -41,8 +38,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = '{{ base_url }}',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -61,7 +56,13 @@ if ($env:{{ disable_update_env_var }}) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:{{ no_modify_path_env_var }}) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:{{ unmanaged_dir_env_var }}
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false

diff --git a/cargo-dist/tests/snapshots/akaikatana_basic.snap b/cargo-dist/tests/snapshots/akaikatana_basic.snap
@@ -1274,9 +1274,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -1285,8 +1282,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = 'https://github.com/mistydemeo/akaikatana-repack/releases/download/v0.2.0',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -1305,7 +1300,13 @@ if ($env:AKAIKATANA_REPACK_DISABLE_UPDATE) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:AKAIKATANA_REPACK_NO_MODIFY_PATH) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:AKAIKATANA_REPACK_UNMANAGED_INSTALL
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false

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
@@ -1302,9 +1302,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -1313,8 +1310,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = 'https://github.com/mistydemeo/akaikatana-repack/releases/download/v0.2.0',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -1333,7 +1328,13 @@ if ($env:AKAIKATANA_REPACK_DISABLE_UPDATE) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:AKAIKATANA_REPACK_NO_MODIFY_PATH) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:AKAIKATANA_REPACK_UNMANAGED_INSTALL
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false

diff --git a/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap b/cargo-dist/tests/snapshots/akaikatana_two_bin_aliases.snap
@@ -1326,9 +1326,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -1337,8 +1334,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = 'https://github.com/mistydemeo/akaikatana-repack/releases/download/v0.2.0',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -1357,7 +1352,13 @@ if ($env:AKAIKATANA_REPACK_DISABLE_UPDATE) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:AKAIKATANA_REPACK_NO_MODIFY_PATH) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:AKAIKATANA_REPACK_UNMANAGED_INSTALL
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false

diff --git a/cargo-dist/tests/snapshots/akaikatana_updaters.snap b/cargo-dist/tests/snapshots/akaikatana_updaters.snap
@@ -1274,9 +1274,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -1285,8 +1282,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = 'https://github.com/mistydemeo/akaikatana-repack/releases/download/v0.2.0',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -1305,7 +1300,13 @@ if ($env:AKAIKATANA_REPACK_DISABLE_UPDATE) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:AKAIKATANA_REPACK_NO_MODIFY_PATH) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:AKAIKATANA_REPACK_UNMANAGED_INSTALL
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false

diff --git a/cargo-dist/tests/snapshots/axolotlsay_abyss.snap b/cargo-dist/tests/snapshots/axolotlsay_abyss.snap
@@ -1274,9 +1274,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -1285,8 +1282,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = 'https://fake.axo.dev/faker/axolotlsay/fake-id-do-not-upload',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -1305,7 +1300,13 @@ if ($env:AXOLOTLSAY_DISABLE_UPDATE) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:AXOLOTLSAY_NO_MODIFY_PATH) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:AXOLOTLSAY_UNMANAGED_INSTALL
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false

diff --git a/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap b/cargo-dist/tests/snapshots/axolotlsay_abyss_only.snap
@@ -1274,9 +1274,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -1285,8 +1282,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = 'https://fake.axo.dev/faker/axolotlsay/fake-id-do-not-upload',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -1305,7 +1300,13 @@ if ($env:AXOLOTLSAY_DISABLE_UPDATE) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:AXOLOTLSAY_NO_MODIFY_PATH) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:AXOLOTLSAY_UNMANAGED_INSTALL
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false

diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias.snap b/cargo-dist/tests/snapshots/axolotlsay_alias.snap
@@ -1302,9 +1302,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -1313,8 +1310,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = 'https://github.com/axodotdev/axolotlsay/releases/download/v0.2.2',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -1333,7 +1328,13 @@ if ($env:AXOLOTLSAY_DISABLE_UPDATE) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:AXOLOTLSAY_NO_MODIFY_PATH) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:AXOLOTLSAY_UNMANAGED_INSTALL
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false

diff --git a/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap b/cargo-dist/tests/snapshots/axolotlsay_alias_ignores_missing_bins.snap
@@ -1306,9 +1306,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -1317,8 +1314,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = 'https://github.com/axodotdev/axolotlsay/releases/download/v0.2.2',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -1337,7 +1332,13 @@ if ($env:AXOLOTLSAY_DISABLE_UPDATE) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:AXOLOTLSAY_NO_MODIFY_PATH) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:AXOLOTLSAY_UNMANAGED_INSTALL
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false

diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic.snap b/cargo-dist/tests/snapshots/axolotlsay_basic.snap
@@ -1274,9 +1274,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -1285,8 +1282,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = 'https://github.com/axodotdev/axolotlsay/releases/download/v0.2.2',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -1305,7 +1300,13 @@ if ($env:AXOLOTLSAY_DISABLE_UPDATE) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:AXOLOTLSAY_NO_MODIFY_PATH) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:AXOLOTLSAY_UNMANAGED_INSTALL
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false

diff --git a/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap b/cargo-dist/tests/snapshots/axolotlsay_basic_lies.snap
@@ -1277,9 +1277,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -1288,8 +1285,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = 'https://github.com/axodotdev/axolotlsay/releases/download/v0.2.2',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -1308,7 +1303,13 @@ if ($env:AXOLOTLSAY_DISABLE_UPDATE) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:AXOLOTLSAY_NO_MODIFY_PATH) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:AXOLOTLSAY_UNMANAGED_INSTALL
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false

diff --git a/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap b/cargo-dist/tests/snapshots/axolotlsay_build_setup_steps.snap
@@ -1274,9 +1274,6 @@ It will then add that dir to PATH by editing your Environment.Path registry key
 .PARAMETER ArtifactDownloadUrl
 The URL of the directory where artifacts can be fetched from
 
-.PARAMETER NoModifyPath
-Don't add the install directory to PATH
-
 .PARAMETER Help
 Print help
 
@@ -1285,8 +1282,6 @@ Print help
 param (
     [Parameter(HelpMessage = "The URL of the directory where artifacts can be fetched from")]
     [string]$ArtifactDownloadUrl = 'https://github.com/axodotdev/axolotlsay/releases/download/v0.2.2',
-    [Parameter(HelpMessage = "Don't add the install directory to PATH")]
-    [switch]$NoModifyPath,
     [Parameter(HelpMessage = "Print Help")]
     [switch]$Help
 )
@@ -1305,7 +1300,13 @@ if ($env:AXOLOTLSAY_DISABLE_UPDATE) {
   $install_updater = $true
 }
 
+$NoModifyPath = $false
+if ($env:AXOLOTLSAY_NO_MODIFY_PATH) {
+    $NoModifyPath = $true
+}
+
 $unmanaged_install = $env:AXOLOTLSAY_UNMANAGED_INSTALL
+
 if ($unmanaged_install) {
   $NoModifyPath = $true
   $install_updater = $false