From 97aeca6e1ba0b5a703f564e4dbae7d976013ce40 Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Sat, 20 Jan 2024 01:02:39 -0800
Subject: [PATCH] feat: Use topgrade for ujust update

---
 .../user/99-bazzite-arch-user-update.sh       |  8 --------
 .../libexec/topgrade/adwaita-for-steam-update |  9 +++++++++
 .../topgrade/mozilla-gnome-theme-update       | 20 +++++++++++++++++++
 .../usr/share/ublue-os/just/10-update.just    | 14 +++++++++++++
 .../usr/share/ublue-os/topgrade/topgrade.toml |  6 +++++-
 5 files changed, 48 insertions(+), 9 deletions(-)
 delete mode 100755 system_files/desktop/shared/usr/etc/ublue-update.d/user/99-bazzite-arch-user-update.sh
 create mode 100755 system_files/desktop/shared/usr/libexec/topgrade/adwaita-for-steam-update
 create mode 100755 system_files/desktop/shared/usr/libexec/topgrade/mozilla-gnome-theme-update
 create mode 100644 system_files/desktop/shared/usr/share/ublue-os/just/10-update.just

diff --git a/system_files/desktop/shared/usr/etc/ublue-update.d/user/99-bazzite-arch-user-update.sh b/system_files/desktop/shared/usr/etc/ublue-update.d/user/99-bazzite-arch-user-update.sh
deleted file mode 100755
index 757bdbbd..00000000
--- a/system_files/desktop/shared/usr/etc/ublue-update.d/user/99-bazzite-arch-user-update.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/bash
-
-if [[ $(podman ps -a --no-trunc --format {{.Names}} | grep -E '(^|\s)bazzite-arch($|\s)') ]]; then
-	unset SUDO_USER # avoid distrobox sudo checks
-	/usr/bin/distrobox-enter -n bazzite-arch -- '  paru -Sua --noconfirm'
-else
-	echo "Update skipped: bazzite-arch not installed"
-fi
diff --git a/system_files/desktop/shared/usr/libexec/topgrade/adwaita-for-steam-update b/system_files/desktop/shared/usr/libexec/topgrade/adwaita-for-steam-update
new file mode 100755
index 00000000..cedfdcc9
--- /dev/null
+++ b/system_files/desktop/shared/usr/libexec/topgrade/adwaita-for-steam-update
@@ -0,0 +1,9 @@
+#!/usr/bin/bash
+shopt -s nullglob
+
+if [ -d "$HOME/homebrew/themes/Adwaita-for-Steam" ]; then
+  cd "$HOME/homebrew/themes/Adwaita-for-Steam"
+  git pull
+fi
+
+exit 0
diff --git a/system_files/desktop/shared/usr/libexec/topgrade/mozilla-gnome-theme-update b/system_files/desktop/shared/usr/libexec/topgrade/mozilla-gnome-theme-update
new file mode 100755
index 00000000..a28f6087
--- /dev/null
+++ b/system_files/desktop/shared/usr/libexec/topgrade/mozilla-gnome-theme-update
@@ -0,0 +1,20 @@
+#!/usr/bin/bash
+shopt -s nullglob
+
+# Flatpak Firefox
+for firefox_gnome_theme in "$HOME/.var/app/org.mozilla.firefox/.mozilla/firefox/"*".default"*"/chrome/firefox-gnome-theme/"; do
+  if [ -d "$firefox_gnome_theme" ]; then
+    cd "$firefox_gnome_theme"
+    git pull
+  fi
+done
+
+# Flatpak Thunderbird
+for thunderbird_gnome_theme in "$HOME/.var/app/org.mozilla.Thunderbird/.thunderbird/"*".default"*"/chrome/thunderbird-gnome-theme/"; do
+  if [ -d "$thunderbird_gnome_theme" ]; then
+    cd "$thunderbird_gnome_theme"
+    git pull
+  fi
+done
+
+exit 0
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
new file mode 100644
index 00000000..6721b121
--- /dev/null
+++ b/system_files/desktop/shared/usr/share/ublue-os/just/10-update.just
@@ -0,0 +1,14 @@
+# vim: set ft=make :
+
+alias upgrade := update
+
+# Update system, flatpaks, and containers all at once
+update:
+    /usr/bin/topgrade --config /usr/share/ublue-os/topgrade/topgrade.toml
+
+# Update device firmware
+[no-exit-message]
+update-firmware:
+    /usr/bin/fwupdmgr refresh --force
+    /usr/bin/fwupdmgr get-updates
+    /usr/bin/fwupdmgr update
diff --git a/system_files/desktop/shared/usr/share/ublue-os/topgrade/topgrade.toml b/system_files/desktop/shared/usr/share/ublue-os/topgrade/topgrade.toml
index 51012556..b1f14a4e 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/topgrade/topgrade.toml
+++ b/system_files/desktop/shared/usr/share/ublue-os/topgrade/topgrade.toml
@@ -3,4 +3,8 @@ paths = ["/etc/topgrade.toml"]
 
 [misc]
 disable = ["toolbx", "self_update"]
-ignore_failures = ["distrobox, "pip3"]
+ignore_failures = ["distrobox", "pip3"]
+
+[commands]
+"Firefox GNOME Theme" = "/usr/libexec/topgrade/mozilla-gnome-theme-update"
+"Steam Adwaita Theme" = "/usr/libexec/topgrade/adwaita-for-steam-update"