Skip to content

Commit

Permalink
Add better python discovery
Browse files Browse the repository at this point in the history
`x.ps1` and `x` will now search for python executables like `python3.9`
and `python3.10.exe`
  • Loading branch information
albertlarsan68 committed Oct 31, 2022
1 parent 4596f4f commit c83ddae
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 1 deletion.
6 changes: 6 additions & 0 deletions x
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 12 additions & 1 deletion x.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit c83ddae

Please sign in to comment.