diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-10-23 08:12:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-23 08:12:41 +0200 |
| commit | cec7d4a0755f5e776a91d1e15850a3d17ee742cc (patch) | |
| tree | 5e7aa24816bacb01d49ff4571767a2b5451f3102 | |
| parent | 26367456789f090bd0cec21c05dfc5187c2c2c94 (diff) | |
| parent | 1f9f041c35106c8c0c05f1a0bad6c2c790451f95 (diff) | |
| download | rust-cec7d4a0755f5e776a91d1e15850a3d17ee742cc.tar.gz rust-cec7d4a0755f5e776a91d1e15850a3d17ee742cc.zip | |
Rollup merge of #117069 - xobs:x.ps1-remove-windows-store-check, r=albertlarsan68
x.ps1: remove the check for Python from Windows Store When installing Python from the Windows Store, a copy of `python.exe` is installed inder the Microsoft directory in the user's local AppData directory. Currently, `x.ps1` checks for this file, because by default running `python.exe` opens a link to the Microsoft Store rather than running Python. Once the user installs Python, however, this contains a valid interpreter. Unfortuantely, `x.ps1` can't tell the difference between a legitimate Python install and the stub. Remove the check, as it makes it impossible to use the official version from Microsoft once it has been installed. This resolves #117067
| -rwxr-xr-x | x.ps1 | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/x.ps1 b/x.ps1 index 55f99901645..eae1a2cb399 100755 --- a/x.ps1 +++ b/x.ps1 @@ -17,11 +17,6 @@ foreach ($arg in $args) { function Get-Application($app) { $cmd = Get-Command $app -ErrorAction SilentlyContinue -CommandType Application | Select-Object -First 1 - if ($cmd.source -match '.*AppData\\Local\\Microsoft\\WindowsApps\\.*exe') { - # Windows for some reason puts a `python3.exe` executable in PATH that just opens the windows store. - # Ignore it. - return $false - } return $cmd } |
