From eb22639dff0fea60e9e14435b7f65277f02e7f3a Mon Sep 17 00:00:00 2001 From: Jakub Panek Date: Fri, 8 Aug 2025 08:49:36 +0200 Subject: [PATCH] cli: Use existing release channel name (#34771) Remove the local `RELEASE_CHANNEL` source that seems to be used only for Linux as opposed to `channel_release::CHANNEL_RELEASE_NAME` for other platform Windows: https://github.com/zed-industries/zed/blob/eee1b1f8a8ba47a14efc524a21b63d896b03feff/crates/cli/src/main.rs#L681-L685 Release Notes: - N/A --- crates/cli/src/main.rs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index 287c62b753..8d6cd2544a 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -400,7 +400,6 @@ mod linux { os::unix::net::{SocketAddr, UnixDatagram}, path::{Path, PathBuf}, process::{self, ExitStatus}, - sync::LazyLock, thread, time::Duration, }; @@ -411,9 +410,6 @@ mod linux { use crate::{Detect, InstalledApp}; - static RELEASE_CHANNEL: LazyLock = - LazyLock::new(|| include_str!("../../zed/RELEASE_CHANNEL").trim().to_string()); - struct App(PathBuf); impl Detect { @@ -444,10 +440,10 @@ mod linux { fn zed_version_string(&self) -> String { format!( "Zed {}{}{} – {}", - if *RELEASE_CHANNEL == "stable" { + if *release_channel::RELEASE_CHANNEL_NAME == "stable" { "".to_string() } else { - format!("{} ", *RELEASE_CHANNEL) + format!("{} ", *release_channel::RELEASE_CHANNEL_NAME) }, option_env!("RELEASE_VERSION").unwrap_or_default(), match option_env!("ZED_COMMIT_SHA") { @@ -459,7 +455,10 @@ mod linux { } fn launch(&self, ipc_url: String) -> anyhow::Result<()> { - let sock_path = paths::data_dir().join(format!("zed-{}.sock", *RELEASE_CHANNEL)); + let sock_path = paths::data_dir().join(format!( + "zed-{}.sock", + *release_channel::RELEASE_CHANNEL_NAME + )); let sock = UnixDatagram::unbound()?; if sock.connect(&sock_path).is_err() { self.boot_background(ipc_url)?;