admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert process failure into error

Browse Source
This commit is contained in:
Roey Darwish Dror
2018-06-03 16:44:19 +03:00
parent 504d79121d
commit 4a208d9e8c
1 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main.rs
View File

@@ -10,6 +10,12 @@ mod error {
Io(::std::io::Error);
}
errors {
ProcessFailed {
description("Process failed")
display("Process failed")
}
}
}
}
@@ -26,24 +32,16 @@ use std::process::{Command, ExitStatus};
use terminal::Terminal;
use which::which;
trait Chain
where
Self: std::marker::Sized,
{
fn and_then<F>(self, f: F) -> ::std::io::Result<Self>
where
F: FnOnce() -> ::std::io::Result<Self>;
trait Check {
fn check(self) -> Result<()>;
}
impl Chain for ExitStatus {
fn and_then<F>(self, f: F) -> ::std::io::Result<Self>
where
F: FnOnce() -> ::std::io::Result<Self>,
{
if !self.success() {
Ok(self)
impl Check for ExitStatus {
fn check(self) -> Result<()> {
if self.success() {
Ok(())
} else {
f()
Err(ErrorKind::ProcessFailed.into())
}
}
}
@@ -176,12 +174,14 @@ fn run() -> Result<()> {
.arg("update")
.spawn()?
.wait()?
.and_then(|| {
.check()
.and_then(|()| {
Command::new(&sudo)
.arg("apt")
.arg("dist-upgrade")
.spawn()?
.wait()
.map_err(|e| e.into())
})?;
}
}
@@ -201,7 +201,14 @@ fn run() -> Result<()> {
.arg("refresh")
.spawn()?
.wait()?
.and_then(|| Command::new(&fwupdmgr).arg("get-updates").spawn()?.wait())?;
.check()
.and_then(|()| {
Command::new(&fwupdmgr)
.arg("get-updates")
.spawn()?
.wait()
.map_err(|e| e.into())
})?;
}
if let Ok(sudo) = &sudo {
@@ -219,13 +226,15 @@ fn run() -> Result<()> {
.arg("update")
.spawn()?
.wait()?
.and_then(|| Command::new(&brew).arg("upgrade").spawn()?.wait())?
.and_then(|| {
.check()
.and_then(|()| Command::new(&brew).arg("upgrade").spawn()?.wait()?.check())
.and_then(|()| {
Command::new(&brew)
.arg("cleanup")
.arg("-sbr")
.spawn()?
.wait()
.map_err(|e| e.into())
})?;
}