16366cf9f2
https://github.com/zed-industries/zed/issues/30972 brought up another case where our context is not enough to track the actual source of the issue: we get a general top-level error without inner error. The reason for this was `.ok_or_else(|| anyhow!("failed to read HEAD SHA"))?; ` on the top level. The PR finally reworks the way we use anyhow to reduce such issues (or at least make it simpler to bubble them up later in a fix). On top of that, uses a few more anyhow methods for better readability. * `.ok_or_else(|| anyhow!("..."))`, `map_err` and other similar error conversion/option reporting cases are replaced with `context` and `with_context` calls * in addition to that, various `anyhow!("failed to do ...")` are stripped with `.context("Doing ...")` messages instead to remove the parasitic `failed to` text * `anyhow::ensure!` is used instead of `if ... { return Err(...); }` calls * `anyhow::bail!` is used instead of `return Err(anyhow!(...));` Release Notes: - N/A
104 lines
3.8 KiB
Rust
104 lines
3.8 KiB
Rust
use anyhow::{Context as _, Result};
|
|
use client::ZED_URL_SCHEME;
|
|
use gpui::{AppContext as _, AsyncApp, Context, PromptLevel, Window, actions};
|
|
use release_channel::ReleaseChannel;
|
|
use std::ops::Deref;
|
|
use std::path::{Path, PathBuf};
|
|
use util::ResultExt;
|
|
use workspace::notifications::{DetachAndPromptErr, NotificationId};
|
|
use workspace::{Toast, Workspace};
|
|
|
|
actions!(cli, [Install, RegisterZedScheme]);
|
|
|
|
async fn install_script(cx: &AsyncApp) -> Result<PathBuf> {
|
|
let cli_path = cx.update(|cx| cx.path_for_auxiliary_executable("cli"))??;
|
|
let link_path = Path::new("/usr/local/bin/zed");
|
|
let bin_dir_path = link_path.parent().unwrap();
|
|
|
|
// Don't re-create symlink if it points to the same CLI binary.
|
|
if smol::fs::read_link(link_path).await.ok().as_ref() == Some(&cli_path) {
|
|
return Ok(link_path.into());
|
|
}
|
|
|
|
// If the symlink is not there or is outdated, first try replacing it
|
|
// without escalating.
|
|
smol::fs::remove_file(link_path).await.log_err();
|
|
// todo("windows")
|
|
#[cfg(not(windows))]
|
|
{
|
|
if smol::fs::unix::symlink(&cli_path, link_path)
|
|
.await
|
|
.log_err()
|
|
.is_some()
|
|
{
|
|
return Ok(link_path.into());
|
|
}
|
|
}
|
|
|
|
// The symlink could not be created, so use osascript with admin privileges
|
|
// to create it.
|
|
let status = smol::process::Command::new("/usr/bin/osascript")
|
|
.args([
|
|
"-e",
|
|
&format!(
|
|
"do shell script \" \
|
|
mkdir -p \'{}\' && \
|
|
ln -sf \'{}\' \'{}\' \
|
|
\" with administrator privileges",
|
|
bin_dir_path.to_string_lossy(),
|
|
cli_path.to_string_lossy(),
|
|
link_path.to_string_lossy(),
|
|
),
|
|
])
|
|
.stdout(smol::process::Stdio::inherit())
|
|
.stderr(smol::process::Stdio::inherit())
|
|
.output()
|
|
.await?
|
|
.status;
|
|
anyhow::ensure!(status.success(), "error running osascript");
|
|
Ok(link_path.into())
|
|
}
|
|
|
|
pub async fn register_zed_scheme(cx: &AsyncApp) -> anyhow::Result<()> {
|
|
cx.update(|cx| cx.register_url_scheme(ZED_URL_SCHEME))?
|
|
.await
|
|
}
|
|
|
|
pub fn install_cli(window: &mut Window, cx: &mut Context<Workspace>) {
|
|
const LINUX_PROMPT_DETAIL: &str = "If you installed Zed from our official release add ~/.local/bin to your PATH.\n\nIf you installed Zed from a different source like your package manager, then you may need to create an alias/symlink manually.\n\nDepending on your package manager, the CLI might be named zeditor, zedit, zed-editor or something else.";
|
|
|
|
cx.spawn_in(window, async move |workspace, cx| {
|
|
if cfg!(any(target_os = "linux", target_os = "freebsd")) {
|
|
let prompt = cx.prompt(
|
|
PromptLevel::Warning,
|
|
"CLI should already be installed",
|
|
Some(LINUX_PROMPT_DETAIL),
|
|
&["Ok"],
|
|
);
|
|
cx.background_spawn(prompt).detach();
|
|
return Ok(());
|
|
}
|
|
let path = install_script(cx.deref())
|
|
.await
|
|
.context("error creating CLI symlink")?;
|
|
|
|
workspace.update_in(cx, |workspace, _, cx| {
|
|
struct InstalledZedCli;
|
|
|
|
workspace.show_toast(
|
|
Toast::new(
|
|
NotificationId::unique::<InstalledZedCli>(),
|
|
format!(
|
|
"Installed `zed` to {}. You can launch {} from your terminal.",
|
|
path.to_string_lossy(),
|
|
ReleaseChannel::global(cx).display_name()
|
|
),
|
|
),
|
|
cx,
|
|
)
|
|
})?;
|
|
register_zed_scheme(&cx).await.log_err();
|
|
Ok(())
|
|
})
|
|
.detach_and_prompt_err("Error installing zed cli", window, cx, |_, _, _| None);
|
|
}
|