zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-26 18:03:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove incorrect venv base directory used (#9661)

Browse Source 
Follow-up of https://github.com/zed-industries/zed/pull/8444

Release Notes:

- N/A
This commit is contained in:
Stanislav Alekseev 2024-03-21 21:34:14 +02:00 committed by GitHub
parent 1e543b9755
commit 3b7cd9cf1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/project/src/terminals.rs
View File

@ -39,11 +39,9 @@ impl Project {
// Alacritty uses parent project's working directory when no working directory is provided
// https://github.com/alacritty/alacritty/blob/fd1a3cc79192d1d03839f0fd8c72e1f8d0fce42e/extra/man/alacritty.5.scd?plain=1#L47-L52
let current_directory = std::env::current_dir().ok();
let venv_base_directory = working_directory
.as_deref()
.or(current_directory.as_deref())
.unwrap_or_else(|| Path::new("")); // if everything fails, use relative path
.unwrap_or_else(|| Path::new(""));
let (spawn_task, shell) = if let Some(spawn_task) = spawn_task {
env.extend(spawn_task.env);