remote: Fix launching from WSL with fish as default shell#48136
remote: Fix launching from WSL with fish as default shell#48136Veykril merged 1 commit intozed-industries:mainfrom
Conversation
|
We require contributors to sign our Contributor License Agreement, and we don't have @apedersen00 on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
|
@cla-bot check |
|
The cla-bot has been summoned, and re-checked this pull request! |
|
Some test commands i ran in PowerShell with and without the Maybe my fish configuration is weird? PS C:\Users\andre> wsl.exe --distribution archlinux --cd ~ env echo "hello"
Bye from Zellij!
. andreasp@mymachine
/ \
/ \ Arch Linux x86_64
/\ \ Linux 6.6.87.1-microsoft-standard-WSL2
/ \ 694 (pacman)
/ \ fish 4.2.1
/ .-. \ Windows Terminal
/ | | _\ WSLg 1.0.66 (Wayland)
/ _.' '._ \ 3 mins
/_.-' '-._\
hello
PS C:\Users\andre> wsl.exe --distribution archlinux --cd ~ --exec env echo "hello"
hello |
|
Yea, your startup scripts are printing which can screw with some commands. On one hand we should |
Closes zed-industries#46801 When connecting to WSL2 with fish as the default shell, Zed gets stuck at "Starting proxy". The connection works fine when bash is the default shell. In `start_proxy()`, the WSL command was being invoked with: ```rust let proxy_process = match wsl_command_impl(&self.connection_options, "env", &proxy_args, false) ``` Changing the last argument to true invokes the WSL command with `--exec` flag which executes the command in the WSL environment without spawning a new shell. With above fix I can launch Zed from WSL (Arch) with fish.
Closes #46801
When connecting to WSL2 with fish as the default shell, Zed gets stuck at "Starting proxy". The connection works fine when bash is the default shell.
In
start_proxy(), the WSL command was being invoked with:Changing the last argument to true invokes the WSL command with
--execflag which executes the command in the WSL environment without spawning a new shell.With above fix I can launch Zed from WSL (Arch) with fish.