From 73a037a38ad68c2e245bd664a436ca1239d971e9 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Fri, 31 May 2024 17:59:10 +0200
Subject: [PATCH 1/3] fix(just): make toggle-updates smarter It will now toggle
 the auto update services relevant for the system depending on ublue-update
 being present or not.

---
 build/ublue-os-just/10-update.just | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/build/ublue-os-just/10-update.just b/build/ublue-os-just/10-update.just
index 9736d1b6..1e9de1ef 100644
--- a/build/ublue-os-just/10-update.just
+++ b/build/ublue-os-just/10-update.just
@@ -88,7 +88,9 @@ toggle-updates ACTION="prompt":
     #!/usr/bin/bash
     source /usr/lib/ujust/ujust.sh
     CURRENT_STATE="Disabled"
-    if systemctl is-enabled ublue-update.timer | grep -q enabled; then
+    if systemctl is-enabled ublue-update.timer 2> /dev/null | grep -q enabled; then
+      CURRENT_STATE="Enabled"
+    elif systemctl is-enabled rpm-ostreed-automatic.timer 2> /dev/null | grep -q enabled; then
       CURRENT_STATE="Enabled"
     fi
     OPTION={{ ACTION }}
@@ -104,15 +106,19 @@ toggle-updates ACTION="prompt":
       exit 0
     fi
     if [ "${OPTION,,}" == "enable" ]; then
-      sudo systemctl enable ublue-update.timer
-      if systemctl is-enabled flatpak-system-update.timer | grep -q disabled; then
+      if systemctl is-enabled ublue-update.timer 2> /dev/null | grep -q not-found; then
         sudo systemctl enable --now flatpak-system-update.timer rpm-ostreed-automatic.timer
         systemctl enable --now --user flatpak-user-update.timer
+      else
+        sudo systemctl enable ublue-update.timer
+        sudo systemctl disable --now flatpak-system-update.timer rpm-ostreed-automatic.timer
+        systemctl disable --now --user flatpak-user-update.timer
       fi
     elif [ "${OPTION,,}" == "disable" ]; then
-      sudo systemctl disable ublue-update.timer
-      if systemctl is-enabled flatpak-system-update.timer | grep -q enabled; then
+      if systemctl is-enabled ublue-update.timer 2> /dev/null | grep -q not-found; then
         sudo systemctl disable --now flatpak-system-update.timer rpm-ostreed-automatic.timer
         systemctl disable --now --user flatpak-user-update.timer
+      else
+        sudo systemctl disable ublue-update.timer
       fi
     fi

From bc035bcb9fb8d86b228f71130f921297c5d6efdf Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Sat, 1 Jun 2024 01:39:50 +0200
Subject: [PATCH 2/3] chore: update version number of just.spec

---
 build/ublue-os-just/ublue-os-just.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/ublue-os-just/ublue-os-just.spec b/build/ublue-os-just/ublue-os-just.spec
index cd14ec91..f6dcbcee 100644
--- a/build/ublue-os-just/ublue-os-just.spec
+++ b/build/ublue-os-just/ublue-os-just.spec
@@ -1,7 +1,7 @@
 Name:           ublue-os-just
 Packager:       ublue-os
 Vendor:         ublue-os
-Version:        0.34
+Version:        0.35
 Release:        1%{?dist}
 Summary:        ublue-os just integration
 License:        MIT
@@ -109,6 +109,9 @@ just --completions bash | sed -E 's/([\(_" ])just/\1ujust/g' > %{_datadir}/bash-
 chmod 644 %{_datadir}/bash-completion/completions/ujust
 
 %changelog
+* Fri May 31 2024 HikariKnight <2557889+HikariKnight@users.noreply.github.com> - 0.35
+- Make toggle-updates smarter and detect if ublue-update is installed
+
 * Sat May 18 2024 m2Giles <69128853+m2Giles@users.noreply.github.com> - 0.34
 - Fix missing sourcefile for just split out
 

From e89919507ce38170b50667a6531f88ef284b25b1 Mon Sep 17 00:00:00 2001
From: HikariKnight <2557889+HikariKnight@users.noreply.github.com>
Date: Wed, 26 Jun 2024 21:56:38 +0200
Subject: [PATCH 3/3] chore: change if condition for CURRENT_STATE to use
 systemctl -q flag

---
 build/ublue-os-just/10-update.just | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/ublue-os-just/10-update.just b/build/ublue-os-just/10-update.just
index 1e9de1ef..75ea189a 100644
--- a/build/ublue-os-just/10-update.just
+++ b/build/ublue-os-just/10-update.just
@@ -88,9 +88,9 @@ toggle-updates ACTION="prompt":
     #!/usr/bin/bash
     source /usr/lib/ujust/ujust.sh
     CURRENT_STATE="Disabled"
-    if systemctl is-enabled ublue-update.timer 2> /dev/null | grep -q enabled; then
+    if systemctl -q is-enabled ublue-update.timer; then
       CURRENT_STATE="Enabled"
-    elif systemctl is-enabled rpm-ostreed-automatic.timer 2> /dev/null | grep -q enabled; then
+    elif systemctl -q is-enabled rpm-ostreed-automatic.timer; then
       CURRENT_STATE="Enabled"
     fi
     OPTION={{ ACTION }}