Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

windows: Don't load login shell environment (#22681)

Browse source 
I'm consistently getting the following error on startup:

```
2025-01-05T14:45:43.4602865+01:00 [ERROR] SHELL environment variable is not assigned so we can't source login environment variables

Caused by:
    environment variable not found
```

The source function, `load_login_shell_environment`, assumes a UNIX
environment and should therefore not be called on Windows. (Unless you
are using git bash?)

Release Notes:

* N/A
This commit is contained in:
Tim Vilgot Mikael Fredenberg 2025-01-07 20:52:47 +01:00 • committed by GitHub
parent c53615ff61
commit bb6e8053d3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/util/src/util.rs
View file

@ -6,7 +6,7 @@ pub mod serde;
#[cfg(any(test, feature = "test-support"))] #[cfg(any(test, feature = "test-support"))]
pub mod test; pub mod test;
use anyhow::{anyhow, Context as _, Result}; use anyhow::Result;
use futures::Future; use futures::Future;
use itertools::Either; use itertools::Either;
use regex::Regex; use regex::Regex;
@ -23,6 +23,9 @@ use std::{
}; };
use unicase::UniCase; use unicase::UniCase;
#[cfg(unix)]
use anyhow::{anyhow, Context as _};
pub use take_until::*; pub use take_until::*;
#[macro_export] #[macro_export]
@ -195,6 +198,7 @@ pub fn load_shell_from_passwd() -> Result<()> {
Ok(()) Ok(())
} }
#[cfg(unix)]
pub fn load_login_shell_environment() -> Result<()> { pub fn load_login_shell_environment() -> Result<()> {
let marker = "ZED_LOGIN_SHELL_START"; let marker = "ZED_LOGIN_SHELL_START";
let shell = env::var("SHELL").context( let shell = env::var("SHELL").context(

10
crates/zed/src/main.rs
View file

@ -48,7 +48,7 @@ use std::{
}; };
use theme::{ActiveTheme, SystemAppearance, ThemeRegistry, ThemeSettings}; use theme::{ActiveTheme, SystemAppearance, ThemeRegistry, ThemeSettings};
use time::UtcOffset; use time::UtcOffset;
use util::{load_login_shell_environment, maybe, ResultExt, TryFutureExt}; use util::{maybe, ResultExt, TryFutureExt};
use uuid::Uuid; use uuid::Uuid;
use welcome::{show_welcome_view, BaseKeymap, FIRST_OPEN}; use welcome::{show_welcome_view, BaseKeymap, FIRST_OPEN};
use workspace::{ use workspace::{
@ -64,7 +64,7 @@ use zed::{
use crate::zed::inline_completion_registry; use crate::zed::inline_completion_registry;
#[cfg(unix)] #[cfg(unix)]
use util::load_shell_from_passwd; use util::{load_login_shell_environment, load_shell_from_passwd};
#[cfg(feature = "mimalloc")] #[cfg(feature = "mimalloc")]
#[global_allocator] #[global_allocator]
@ -255,13 +255,11 @@ fn main() {
paths::keymap_file().clone(), paths::keymap_file().clone(),
); );
#[cfg(unix)]
if !stdout_is_a_pty() { if !stdout_is_a_pty() {
app.background_executor() app.background_executor()
.spawn(async { .spawn(async {
#[cfg(unix)] load_shell_from_passwd().log_err();
{
load_shell_from_passwd().log_err();
}
load_login_shell_environment().log_err(); load_login_shell_environment().log_err();
}) })
.detach() .detach()