vndangkhoa/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2026-06-01 03:14:56 +07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix zed cli in NixOS WSL instances (#43433)

Browse source 
This fixes running `zed <path>` inside nixos wsl instances. We're
copying the approach used elsewhere which is to try using `--exec`
first, and if that fails use an actual shell which should cover the
nixos case because it only puts binaries on your PATH inside the
`/etc/profile` script which is sourced on shell startup.

Release Notes:

- N/A

---------

Co-authored-by: John Tur <john-tur@outlook.com>
This commit is contained in:
Julia Ryan 2025-11-24 13:46:13 -08:00 committed by GitHub
parent 9e69ac889c
commit f75e7582e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
crates/cli/src/main.rs
View file

@ -12,7 +12,9 @@ use clap::Parser;
use cli::{CliRequest, CliResponse, IpcHandshake, ipc::IpcOneShotServer};
use parking_lot::Mutex;
use std::{
env, fs, io,
env,
ffi::OsStr,
fs, io,
path::{Path, PathBuf},
process::ExitStatus,
sync::Arc,
@ -300,7 +302,6 @@ mod tests {
fn parse_path_in_wsl(source: &str, wsl: &str) -> Result<String> {
let mut source = PathWithPosition::parse_str(source);
let mut command = util::command::new_std_command("wsl.exe");
let (user, distro_name) = if let Some((user, distro)) = wsl.split_once('@') {
if user.is_empty() {
@ -311,20 +312,34 @@ fn parse_path_in_wsl(source: &str, wsl: &str) -> Result<String> {
(None, wsl)
};
let mut args = vec!["--distribution", distro_name];
if let Some(user) = user {
command.arg("--user").arg(user);
args.push("--user");
args.push(user);
}
let output = command
.arg("--distribution")
.arg(distro_name)
.arg("--exec")
.arg("realpath")
.arg("-s")
.arg(&source.path)
.output()?;
let command = [
OsStr::new("realpath"),
OsStr::new("-s"),
source.path.as_ref(),
];
let output = util::command::new_std_command("wsl.exe")
.args(&args)
.arg("--exec")
.args(&command)
.output()?;
let result = if output.status.success() {
String::from_utf8_lossy(&output.stdout).to_string()
} else {
let fallback = util::command::new_std_command("wsl.exe")
.args(&args)
.arg("--")
.args(&command)
.output()?;
String::from_utf8_lossy(&fallback.stdout).to_string()
};
let result = String::from_utf8_lossy(&output.stdout);
source.path = Path::new(result.trim()).to_owned();
Ok(source.to_string(|path| path.to_string_lossy().into_owned()))