From bac45b73b7b7873f9432c1ca85f88cf87a166cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alberto=20Garc=C3=ADa?=
 <4411661+GarciaLnk@users.noreply.github.com>
Date: Sun, 6 Oct 2024 02:20:03 +0000
Subject: [PATCH] fix: move to packaged topgrade

---
 build_files/fetch-install.sh                                | 3 ---
 packages.json                                               | 1 +
 .../lib/systemd/system/ublue-update.service.d/override.conf | 2 ++
 system_files/shared/usr/share/ublue-os/just/10-update.just  | 1 +
 system_files/shared/usr/share/ublue-os/topgrade.toml        | 6 +++++-
 5 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 system_files/shared/usr/lib/systemd/system/ublue-update.service.d/override.conf

diff --git a/build_files/fetch-install.sh b/build_files/fetch-install.sh
index 747adc90..4b2f7a15 100755
--- a/build_files/fetch-install.sh
+++ b/build_files/fetch-install.sh
@@ -6,9 +6,6 @@ set -ouex pipefail
 mkdir -p /etc/flatpak/remotes.d
 curl -Lo /etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo
 
-# Topgrade Install
-pip install --prefix=/usr topgrade
-
 # Install ublue-update -- breaks with packages.json disable staging to use bling.
 sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo
 rpm-ostree install ublue-update
diff --git a/packages.json b/packages.json
index ddc0ae38..39eee438 100644
--- a/packages.json
+++ b/packages.json
@@ -61,6 +61,7 @@
 				"stress-ng",
 				"tailscale",
 				"tmux",
+				"topgrade",
 				"usbmuxd",
 				"waydroid",
 				"wine-core",
diff --git a/system_files/shared/usr/lib/systemd/system/ublue-update.service.d/override.conf b/system_files/shared/usr/lib/systemd/system/ublue-update.service.d/override.conf
new file mode 100644
index 00000000..3c76a135
--- /dev/null
+++ b/system_files/shared/usr/lib/systemd/system/ublue-update.service.d/override.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="TOPGRADE_SKIP_BRKC_NOTIFY=true"
diff --git a/system_files/shared/usr/share/ublue-os/just/10-update.just b/system_files/shared/usr/share/ublue-os/just/10-update.just
index 68b86dad..76f08fee 100644
--- a/system_files/shared/usr/share/ublue-os/just/10-update.just
+++ b/system_files/shared/usr/share/ublue-os/just/10-update.just
@@ -5,6 +5,7 @@ alias upgrade := update
 # Update system, flatpaks, and containers all at once
 update:
     #!/usr/bin/bash
+    ublue-update --wait
     /usr/bin/topgrade --config /usr/share/ublue-os/topgrade.toml --keep
 
 alias auto-update := toggle-updates
diff --git a/system_files/shared/usr/share/ublue-os/topgrade.toml b/system_files/shared/usr/share/ublue-os/topgrade.toml
index 82e4ea0d..4e1d14ed 100644
--- a/system_files/shared/usr/share/ublue-os/topgrade.toml
+++ b/system_files/shared/usr/share/ublue-os/topgrade.toml
@@ -1,6 +1,6 @@
 [misc]
 no_self_update = true
-disable = ["self_update", "toolbx", "containers", "helm"]
+disable = ["self_update", "toolbx", "containers"]
 ignore_failures = [
   "distrobox",
   "flatpak",
@@ -9,9 +9,13 @@ ignore_failures = [
   "nix",
   "node",
   "pip3",
+  "git_repos",
+  "helm",
   "home_manager",
   "firmware",
+  "shell",
   "snap",
+  "waydroid",
 ]
 assume_yes = true
 no_retry = false