mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-04-02 05:23:14 +00:00
update ota script, rbind for dependency mounts, cli list-ingredients fix, and formatting
This commit is contained in:
@@ -154,7 +154,10 @@ async fn add_asset(
|
||||
})?;
|
||||
Ok(())
|
||||
} else {
|
||||
Err(Error::new(eyre!("{}", t!("registry.os.asset.unauthorized")), ErrorKind::Authorization))
|
||||
Err(Error::new(
|
||||
eyre!("{}", t!("registry.os.asset.unauthorized")),
|
||||
ErrorKind::Authorization,
|
||||
))
|
||||
}
|
||||
})
|
||||
.await
|
||||
@@ -231,10 +234,12 @@ pub async fn cli_add_asset(
|
||||
|
||||
sign_phase.start();
|
||||
let blake3 = file.blake3_mmap().await?;
|
||||
let size = file
|
||||
.size()
|
||||
.await
|
||||
.ok_or_else(|| Error::new(eyre!("{}", t!("registry.os.asset.failed-read-metadata")), ErrorKind::Filesystem))?;
|
||||
let size = file.size().await.ok_or_else(|| {
|
||||
Error::new(
|
||||
eyre!("{}", t!("registry.os.asset.failed-read-metadata")),
|
||||
ErrorKind::Filesystem,
|
||||
)
|
||||
})?;
|
||||
let commitment = Blake3Commitment {
|
||||
hash: Base64(*blake3.as_bytes()),
|
||||
size,
|
||||
@@ -336,7 +341,10 @@ async fn remove_asset(
|
||||
.remove(&platform)?;
|
||||
Ok(())
|
||||
} else {
|
||||
Err(Error::new(eyre!("{}", t!("registry.os.asset.unauthorized")), ErrorKind::Authorization))
|
||||
Err(Error::new(
|
||||
eyre!("{}", t!("registry.os.asset.unauthorized")),
|
||||
ErrorKind::Authorization,
|
||||
))
|
||||
}
|
||||
})
|
||||
.await
|
||||
|
||||
@@ -125,17 +125,9 @@ pub struct CliGetOsAssetParams {
|
||||
pub version: Version,
|
||||
#[arg(help = "help.arg.platform")]
|
||||
pub platform: InternedString,
|
||||
#[arg(
|
||||
long = "download",
|
||||
short = 'd',
|
||||
help = "help.arg.download-directory"
|
||||
)]
|
||||
#[arg(long = "download", short = 'd', help = "help.arg.download-directory")]
|
||||
pub download: Option<PathBuf>,
|
||||
#[arg(
|
||||
long = "reverify",
|
||||
short = 'r',
|
||||
help = "help.arg.reverify-hash"
|
||||
)]
|
||||
#[arg(long = "reverify", short = 'r', help = "help.arg.reverify-hash")]
|
||||
pub reverify: bool,
|
||||
}
|
||||
|
||||
|
||||
@@ -89,7 +89,10 @@ async fn sign_asset(
|
||||
.contains(&guid)
|
||||
{
|
||||
return Err(Error::new(
|
||||
eyre!("{}", t!("registry.os.asset.signer-not-authorized", guid = guid)),
|
||||
eyre!(
|
||||
"{}",
|
||||
t!("registry.os.asset.signer-not-authorized", guid = guid)
|
||||
),
|
||||
ErrorKind::Authorization,
|
||||
));
|
||||
}
|
||||
@@ -184,10 +187,12 @@ pub async fn cli_sign_asset(
|
||||
|
||||
sign_phase.start();
|
||||
let blake3 = file.blake3_mmap().await?;
|
||||
let size = file
|
||||
.size()
|
||||
.await
|
||||
.ok_or_else(|| Error::new(eyre!("{}", t!("registry.os.asset.failed-read-metadata")), ErrorKind::Filesystem))?;
|
||||
let size = file.size().await.ok_or_else(|| {
|
||||
Error::new(
|
||||
eyre!("{}", t!("registry.os.asset.failed-read-metadata")),
|
||||
ErrorKind::Filesystem,
|
||||
)
|
||||
})?;
|
||||
let commitment = Blake3Commitment {
|
||||
hash: Base64(*blake3.as_bytes()),
|
||||
size,
|
||||
|
||||
@@ -26,7 +26,6 @@ pub fn os_api<C: Context>() -> ParentHandler<C> {
|
||||
)
|
||||
.subcommand(
|
||||
"version",
|
||||
version::version_api::<C>()
|
||||
.with_about("about.commands-add-remove-list-versions"),
|
||||
version::version_api::<C>().with_about("about.commands-add-remove-list-versions"),
|
||||
)
|
||||
}
|
||||
|
||||
@@ -95,7 +95,14 @@ pub async fn remove_version_signer(
|
||||
.mutate(|s| Ok(s.remove(&signer)))?
|
||||
{
|
||||
return Err(Error::new(
|
||||
eyre!("{}", t!("registry.os.version.signer-not-authorized", signer = signer, version = version)),
|
||||
eyre!(
|
||||
"{}",
|
||||
t!(
|
||||
"registry.os.version.signer-not-authorized",
|
||||
signer = signer,
|
||||
version = version
|
||||
)
|
||||
),
|
||||
ErrorKind::NotFound,
|
||||
));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user