From d3b33b2753581c6e997b90f580b71dfed116a950 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Mon, 22 Jan 2024 21:52:05 -0800 Subject: [PATCH] chore(just): Remove unneeded firmware updater chore(updater): Keep System Update window open after completion for review chore(updater): Assume yes and offer to retry on failure --- .../shared/usr/share/ublue-os/just/10-update.just | 10 ++-------- .../desktop/shared/usr/share/ublue-os/topgrade.toml | 2 ++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/10-update.just b/system_files/desktop/shared/usr/share/ublue-os/just/10-update.just index b962b552..4285503b 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/just/10-update.just +++ b/system_files/desktop/shared/usr/share/ublue-os/just/10-update.just @@ -4,11 +4,5 @@ alias upgrade := update # Update system, flatpaks, and containers all at once update: - /usr/bin/topgrade --config /usr/share/ublue-os/topgrade.toml - -# Update device firmware -[no-exit-message] -update-firmware: - /usr/bin/fwupdmgr refresh --force - /usr/bin/fwupdmgr get-updates - /usr/bin/fwupdmgr update + #!/usr/bin/bash + /usr/bin/topgrade --config /usr/share/ublue-os/topgrade.toml --keep diff --git a/system_files/desktop/shared/usr/share/ublue-os/topgrade.toml b/system_files/desktop/shared/usr/share/ublue-os/topgrade.toml index fcc25052..5b14decb 100644 --- a/system_files/desktop/shared/usr/share/ublue-os/topgrade.toml +++ b/system_files/desktop/shared/usr/share/ublue-os/topgrade.toml @@ -5,6 +5,8 @@ paths = ["/etc/ublue-os/topgrade.toml"] no_self_update = true disable = ["toolbx", "self_update"] ignore_failures = ["distrobox", "flatpak", "brew_cask", "brew_formula", "nix", "pip3"] +assume_yes = true +no_retry = false [linux] rpm_ostree = true