Skip to content

Make x tool work with MS store's installed python #105786

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Make x tool work with MS store's installed python #105786

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e117fc
Make x tool work with MS store's installed python
albertlarsan68 Dec 16, 2022
ed31017
"Add comment explaining the change"
albertlarsan68 Dec 16, 2022
bd04726
Make the change actually work correctly
albertlarsan68 Dec 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/tools/x/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,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).with_extension(EXE_EXTENSION).exists() {
if dir.join(PYTHON).with_extension(EXE_EXTENSION).try_exists().is_ok() {
return PYTHON;
}

python2 |= dir.join(PYTHON2).with_extension(EXE_EXTENSION).exists();
python3 |= dir.join(PYTHON3).with_extension(EXE_EXTENSION).exists();
python2 |= dir.join(PYTHON2).with_extension(EXE_EXTENSION).try_exists().is_ok();
python3 |= dir.join(PYTHON3).with_extension(EXE_EXTENSION).try_exists().is_ok();
}

// try 3 before 2
Expand Down