diff options
| author | SparkyPotato <noob.sparkypotato@gmail.com> | 2022-11-13 15:51:16 +0530 |
|---|---|---|
| committer | SparkyPotato <noob.sparkypotato@gmail.com> | 2022-11-13 15:51:16 +0530 |
| commit | 56dfb70d8d1103e49dfe6feb337ef1f1bb20ff88 (patch) | |
| tree | 51858e662074a0f4fa20df0db993d6750f6dc074 /src | |
| parent | 825f8edc2fff167304d40c826f136e82967d68f3 (diff) | |
| download | rust-56dfb70d8d1103e49dfe6feb337ef1f1bb20ff88.tar.gz rust-56dfb70d8d1103e49dfe6feb337ef1f1bb20ff88.zip | |
use `EXE_EXTENSION` while searching for python
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/x/src/main.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/x/src/main.rs b/src/tools/x/src/main.rs index 9187c3551d7..02c364dabf9 100644 --- a/src/tools/x/src/main.rs +++ b/src/tools/x/src/main.rs @@ -8,7 +8,8 @@ //! `x.py`, in that order of preference. use std::{ - env, io, + env::{self, consts::EXE_EXTENSION}, + io, process::{self, Command, ExitStatus}, }; @@ -27,12 +28,12 @@ fn python() -> &'static str { for dir in env::split_paths(&val) { // `python` should always take precedence over python2 / python3 if it exists - if dir.join(PYTHON).exists() { + if dir.join(PYTHON).with_extension(EXE_EXTENSION).exists() { return PYTHON; } - python2 |= dir.join(PYTHON2).exists(); - python3 |= dir.join(PYTHON3).exists(); + python2 |= dir.join(PYTHON2).with_extension(EXE_EXTENSION).exists(); + python3 |= dir.join(PYTHON3).with_extension(EXE_EXTENSION).exists(); } // try 3 before 2 |
