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

Implement cleanup for flatpak (#801)

Browse Source 
* Cleanup flatpak

* Fix compile error

* Make sure we only move our values at the very end

* Access config.cleanup() through ExecutionContext
This commit is contained in:
M*C*O
2021-11-20 14:32:20 +01:00
committed by GitHub
parent 1db6dc5470
commit 8fb8927fea
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,6 +450,7 @@ pub fn run_fwupdmgr(ctx: &ExecutionContext) -> Result<()> {
pub fn flatpak_update(ctx: &ExecutionContext) -> Result<()> {
let flatpak = require("flatpak")?;
let sudo = require_option(ctx.sudo().as_ref(), String::from("sudo is not installed"))?;
let cleanup = ctx.config().cleanup();
let run_type = ctx.run_type();
print_separator("Flatpak User Packages");
@@ -457,22 +458,43 @@ pub fn flatpak_update(ctx: &ExecutionContext) -> Result<()> {
.execute(&flatpak)
.args(&["update", "--user", "-y"])
.check_run()?;
if cleanup {
run_type
.execute(&flatpak)
.args(&["uninstall", "--user", "--unused"])
.check_run()?;
}
print_separator("Flatpak System Packages");
if ctx.config().flatpak_use_sudo() || std::env::var("SSH_CLIENT").is_ok() {
run_type
.execute(&sudo)
.arg(&flatpak)
.args(&["update", "--system", "-y"])
.check_run()?;
if cleanup {
run_type
.execute(sudo)
.arg(flatpak)
.args(&["update", "--system", "-y"])
.check_run()
.args(&["uninstall", "--system", "--unused"])
.check_run()?;
}
} else {
run_type
.execute(&flatpak)
.args(&["update", "--system", "-y"])
.check_run()
.check_run()?;
if cleanup {
run_type
.execute(flatpak)
.args(&["uninstall", "--system", "--unused"])
.check_run()?;
}
}
Ok(())
}
pub fn run_snap(sudo: Option<&PathBuf>, run_type: RunType) -> Result<()> {
let sudo = require_option(sudo, String::from("sudo is not installed"))?;
let snap = require("snap")?;