Support shell command in windows #363
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aisk
commented
Jul 13, 2023
| @@ -36,14 +76,29 @@ pub fn execute(cmd: Args) -> Result<(), Error> { | |||
| .context("failed to sync ahead of shell")?; | |||
|
|
|||
| let venv_path = pyproject.venv_path(); | |||
| let venv_bin = venv_path.join("bin"); | |||
| let venv_bin = if env::consts::OS == "windows" { | |||
There was a problem hiding this comment.
I think it should be determined in runtime instead of compile time, so using env::consts::OS == "windows" instead of cfg!(windows).
Maybe we will using binaries build in windows and runs on linux (wine?).
There was a problem hiding this comment.
Note that this conditional - bin vs Scripts - is also done once already in rye/src/consts.rs
There was a problem hiding this comment.
Updated, thanks for the review!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The main change is detecting the OSs and shells, and when it's MS's shells (cmd.exe / powershell), using
;as path seprator. And when it's windows OS, usingvenv/Scriptsinstead ofvenv/binasvenv_bin(pypa/virtualenv@993ba13).There is no simple way to detect which shell is been used, this PR try to iterate parent processes which name is cmd.exe / powershell.exe / pwsh.exe to determine the shell if no
SHELLenvironment variable present.Tested on:
Add a new dependency
sysinfofor get parrent pid and process name. There are some candidates:The sysinfo is a little too heavy, I think psutil is more suitable if it support windows, but for now it's ok to use sysinfo. Or maybe we can use winapi to call the native library directly?