Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for rsync before downloading updates (#19392)

Browse source
This commit is contained in:
Peter Tripp 2024-10-22 21:12:26 +00:00 • committed by GitHub
parent 263e143d1b
commit 47ade2f9f9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1009,6 +1009,7 @@ dependencies = [
"smol", "smol",
"tempfile", "tempfile",
"util", "util",
"which 6.0.3",
"workspace", "workspace",
] ]

1
crates/auto_update/Cargo.toml
View file

@ -32,4 +32,5 @@ settings.workspace = true
smol.workspace = true smol.workspace = true
tempfile.workspace = true tempfile.workspace = true
util.workspace = true util.workspace = true
which.workspace = true
workspace.workspace = true workspace.workspace = true

7
crates/auto_update/src/auto_update.rs
View file

@ -33,6 +33,7 @@ use std::{
}; };
use update_notification::UpdateNotification; use update_notification::UpdateNotification;
use util::ResultExt; use util::ResultExt;
use which::which;
use workspace::notifications::NotificationId; use workspace::notifications::NotificationId;
use workspace::Workspace; use workspace::Workspace;
@ -560,6 +561,12 @@ impl AutoUpdater {
"linux" => Ok("zed.tar.gz"), "linux" => Ok("zed.tar.gz"),
_ => Err(anyhow!("not supported: {:?}", OS)), _ => Err(anyhow!("not supported: {:?}", OS)),
}?; }?;
anyhow::ensure!(
which("rsync").is_ok(),
"Aborting. Could not find rsync which is required for auto-updates."
);
let downloaded_asset = temp_dir.path().join(filename); let downloaded_asset = temp_dir.path().join(filename);
download_release(&downloaded_asset, release, client, &cx).await?; download_release(&downloaded_asset, release, client, &cx).await?;