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

Use flatpak --system to update flatpak (fix #107)

Browse Source
This commit is contained in:
Roey Darwish Dror
2019-01-16 11:28:37 +02:00
parent d8a9111c48
commit e9d76d185b
2 changed files with 6 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.rs
View File

@@ -211,8 +211,7 @@ fn run() -> Result<(), Error> {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
{ {
report.push_result(execute(|| linux::flatpak_user_update(run_type), opt.no_retry)?); report.push_result(execute(|| linux::flatpak_update(run_type), opt.no_retry)?);
report.push_result(execute(|| linux::flatpak_global_update(&sudo, run_type), opt.no_retry)?);
report.push_result(execute(|| linux::run_snap(&sudo, run_type), opt.no_retry)?); report.push_result(execute(|| linux::run_snap(&sudo, run_type), opt.no_retry)?);
} }

28
src/steps/os/linux.rs
View File

@@ -274,7 +274,7 @@ pub fn run_fwupdmgr(run_type: RunType) -> Option<(&'static str, bool)> {
} }
#[must_use] #[must_use]
pub fn flatpak_user_update(run_type: RunType) -> Option<(&'static str, bool)> { pub fn flatpak_update(run_type: RunType) -> Option<(&'static str, bool)> {
if let Some(flatpak) = which("flatpak") { if let Some(flatpak) = which("flatpak") {
print_separator("Flatpak User Packages"); print_separator("Flatpak User Packages");
@@ -283,6 +283,10 @@ pub fn flatpak_user_update(run_type: RunType) -> Option<(&'static str, bool)> {
.execute(&flatpak) .execute(&flatpak)
.args(&["update", "--user", "-y"]) .args(&["update", "--user", "-y"])
.check_run()?; .check_run()?;
run_type
.execute(&flatpak)
.args(&["update", "--system", "-y"])
.check_run()?;
Ok(()) Ok(())
}() }()
.is_ok(); .is_ok();
@@ -293,28 +297,6 @@ pub fn flatpak_user_update(run_type: RunType) -> Option<(&'static str, bool)> {
None None
} }
#[must_use]
pub fn flatpak_global_update(sudo: &Option<PathBuf>, run_type: RunType) -> Option<(&'static str, bool)> {
if let Some(sudo) = sudo {
if let Some(flatpak) = which("flatpak") {
print_separator("Flatpak Global Packages");
let success = || -> Result<(), Error> {
run_type
.execute(&sudo)
.args(&[flatpak.to_str().unwrap(), "update", "-y"])
.check_run()?;
Ok(())
}()
.is_ok();
return Some(("Flatpak Global Packages", success));
}
}
None
}
#[must_use] #[must_use]
pub fn run_snap(sudo: &Option<PathBuf>, run_type: RunType) -> Option<(&'static str, bool)> { pub fn run_snap(sudo: &Option<PathBuf>, run_type: RunType) -> Option<(&'static str, bool)> {
if let Some(sudo) = sudo { if let Some(sudo) = sudo {