diff --git a/.gitattributes b/.gitattributes index 9973cfb4db..0dedc2d567 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,5 @@ # Prevent GitHub from displaying comments within JSON files as errors. *.json linguist-language=JSON-with-Comments + +# Ensure the WSL script always has LF line endings, even on Windows +crates/zed/resources/windows/zed-wsl text eol=lf diff --git a/crates/remote/src/transport/wsl.rs b/crates/remote/src/transport/wsl.rs index ea8f2443d9..2b4d29eafe 100644 --- a/crates/remote/src/transport/wsl.rs +++ b/crates/remote/src/transport/wsl.rs @@ -164,10 +164,7 @@ impl WslRemoteConnection { delegate.set_status(Some("Installing remote server"), cx); let wanted_version = match release_channel { - ReleaseChannel::Nightly => None, - ReleaseChannel::Dev => { - return Err(anyhow!("Dev builds require manual installation")); - } + ReleaseChannel::Nightly | ReleaseChannel::Dev => None, _ => Some(cx.update(|cx| AppVersion::global(cx))?), }; @@ -176,7 +173,7 @@ impl WslRemoteConnection { .await?; let tmp_path = RemotePathBuf::new( - PathBuf::from(format!("{}.{}.tmp", dst_path, std::process::id())), + PathBuf::from(format!("{}.{}.gz", dst_path, std::process::id())), PathStyle::Posix, );