fix: remove ublue-update and rely on units to get auto updates instead (

#2181)
ublue-os · Feb 5, 2025 · 12ecbfd · 12ecbfd
1 parent c2ff376
commit 12ecbfd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 16 deletions.
diff --git a/build_files/base/05-override-install.sh b/build_files/base/05-override-install.sh
@@ -35,9 +35,6 @@ install -c -m 0755 /tmp/starship /usr/bin
 # shellcheck disable=SC2016
 echo 'eval "$(starship init bash)"' >> /etc/bashrc
 
-# Install ublue-update -- breaks with packages.json due to missing topgrade
-dnf5 -y install ublue-update
-
 # Required for bluefin faces to work without conflicting with a ton of packages
 rm -f /usr/share/pixmaps/faces/* || echo "Expected directory deletion to fail"
 mv /usr/share/pixmaps/faces/bluefin/* /usr/share/pixmaps/faces
@@ -53,9 +50,6 @@ dnf5 -y swap fedora-logos bluefin-logos
 # Consolidate Just Files
 find /tmp/just -iname '*.just' -exec printf "\n\n" \; -exec cat {} \; >> /usr/share/ublue-os/just/60-custom.just
 
-# Move over ublue-update config
-mv -f /tmp/ublue-update.toml /usr/etc/ublue-update/ublue-update.toml
-
 # Register Fonts
 fc-cache -f /usr/share/fonts/ubuntu
 fc-cache -f /usr/share/fonts/inter

diff --git a/build_files/base/17-cleanup.sh b/build_files/base/17-cleanup.sh
@@ -9,7 +9,9 @@ systemctl enable rpm-ostree-countme.service
 systemctl enable tailscaled.service
 systemctl enable dconf-update.service
 systemctl --global enable ublue-flatpak-manager.service
-systemctl enable ublue-update.timer
+systemctl enable rpm-ostreed-automatic.timer
+systemctl enable flatpak-system-update.timer
+systemctl --global enable flatpak-user-update.timer
 systemctl enable ublue-system-setup.service
 systemctl enable ublue-guest-user.service
 systemctl enable brew-setup.service

diff --git a/build_files/shared/build-base.sh b/build_files/shared/build-base.sh
@@ -30,7 +30,6 @@ mkdir -p /var/lib/alternatives
 # Copy Files to Container
 cp -r /ctx/just /tmp/just
 cp /ctx/packages.json /tmp/packages.json
-cp /ctx/system_files/shared/etc/ublue-update/ublue-update.toml /tmp/ublue-update.toml
 rsync -rvK /ctx/system_files/shared/ /
 rsync -rvK /ctx/system_files/"${BASE_IMAGE_NAME}"/ /
 echo "::endgroup::"

diff --git a/packages.json b/packages.json
@@ -168,8 +168,7 @@
 			"all": [
 				"firefox-langpacks",
 				"firefox",
-				"podman-docker",
-				"ublue-os-update-services"
+				"podman-docker"
 			],
 			"silverblue": [
 				"gnome-extensions-app",

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
@@ -5,9 +5,9 @@ alias upgrade := update
 # Update system, flatpaks, and containers all at once
 update:
     #!/usr/bin/bash
-    TOPGRADE_CONFIG="/usr/share/ublue-os/topgrade"
-    /usr/bin/grep "^LockLayering=true" /etc/rpm-ostreed.conf &>/dev/null && TOPGRADE_CONFIG="${TOPGRADE_CONFIG}-bootc"
-    /usr/bin/topgrade --config "${TOPGRADE_CONFIG}.toml" --keep
+    rpm-ostree upgrade
+    flatpak update -y
+    brew update
 
 alias auto-update := toggle-updates
 
@@ -16,7 +16,7 @@ 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 rpm-ostreed-automatic.timer  | grep -q enabled; then
         CURRENT_STATE="Enabled"
     fi
     OPTION={{ ACTION }}
@@ -32,9 +32,9 @@ toggle-updates ACTION="prompt":
         exit 0
     fi
     if [ "${OPTION,,}" == "enable" ]; then
-        sudo systemctl enable ublue-update.timer
+        sudo systemctl enable rpm-ostreed-automatic.timer
     elif [ "${OPTION,,}" == "disable" ]; then
-        sudo systemctl disable ublue-update.timer
+        sudo systemctl disable rpm-ostreed-automatic.timer
     fi
 
 alias changelog := changelogs