bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #103007 - albertlarsan68:better-python-discovery, r=jyn514

Browse source 
Add better python discovery

The Microsoft Store version of Python installs itself as `pythonM.m`, with `M` being the major version and `m` the minor.

The `x.ps1` script will now search for python executables whose command matches the regex `python\d`.
The `\d` at the end is to protect from using the `pythonw` versions, which do not work as standard python.
This commit is contained in:
Yuki Okushi 2022-11-01 12:03:40 +09:00 • committed by GitHub
commit a6ac6b20f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
x
View file

@ -29,5 +29,11 @@ for SEARCH_PYTHON in py python3 python python2; do
exec "$python" $extra_arg "$xpy" "$@"
fi
done
python=$(bash -c "compgen -c python" | grep '^python[2-3]\.[0-9]\+$' | head -n1)
if ! [ "$python" = "" ]; then
exec "$python" "$xpy" "$@"
fi
echo "$0: error: did not find python installed" >&2
exit 1

13
x.ps1
View file

@ -10,11 +10,15 @@ foreach ($arg in $args) {
$xpy_args += """$arg"""
}
function Get-Application($app) {
return Get-Command $app -ErrorAction SilentlyContinue -CommandType Application
}
foreach ($python in "py", "python3", "python", "python2") {
# NOTE: this only tests that the command exists in PATH, not that it's actually
# executable. The latter is not possible in a portable way, see
# https://github.com/PowerShell/PowerShell/issues/12625.
if (Get-Command $python -ErrorAction SilentlyContinue) {
if (Get-Application $python) {
if ($python -eq "py") {
# Use python3, not python2
$xpy_args = @("-3") + $xpy_args
@ -24,5 +28,12 @@ foreach ($python in "py", "python3", "python", "python2") {
}
}
$found = (Get-Application "python*" | Where-Object {$_.name -match '^python[2-3]\.[0-9]+(\.exe)?$'})
if (($null -ne $found) -and ($found.Length -ge 1)) {
$python = $found[0]
$process = Start-Process -NoNewWindow -Wait -PassThru $python $xpy_args
Exit $process.ExitCode
}
Write-Error "${PSCommandPath}: error: did not find python installed"
Exit 1