Skip to content

feat(just): use uupd for system upgrades v2 #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
renner0e wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −51
Draft

feat(just): use uupd for system upgrades v2 #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions system_files/shared/usr/lib/systemd/system/uupd-manual.service.d/nice-output.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Service]
ExecStart=
ExecStart=bash -c '/usr/bin/uupd --hw-check=false --json --log-level=debug | jq -r \x27[.title, .msg, .description] | map(select(.)) | join(" ")\x27'
53 changes: 2 additions & 51 deletions system_files/shared/usr/share/ublue-os/just/update.just
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,57 +18,8 @@ update:
exit 1
fi

if systemd-detect-virt --container -q; then
echo "Running inside a container environment, nothing to upgrade"
exit 1
elif grep -q -E "(^|\s)composefs=.*\S" /proc/cmdline; then
IS_COMPOSEFS="true"
IS_OSTREE="false"
elif grep -q -E "(^|\s)ostree=.*\S" /proc/cmdline; then
IS_COMPOSEFS="false"
IS_OSTREE="true"
else
echo "Not booted, nothing to upgrade."
exit 1
fi

if [[ "${IS_COMPOSEFS}" == "true" ]]; then
sudo bootc upgrade

elif [[ "${IS_OSTREE}" == "true" ]]; then
# Without password would be nice
# https://github.com/bootc-dev/bootc/issues/409
STATUS=$(sudo bootc status --json | jq ".status")

STAGED_INCOMPAT=$(echo "${STATUS}" | jq ".staged.incompatible")
BOOTED_INCOMPAT=$(echo "${STATUS}" | jq ".booted.incompatible")

if [[ "${STAGED_INCOMPAT}" == "true" || ( "${BOOTED_INCOMPAT}" == "true" && -z "${STAGED_INCOMPAT}" ) || "${BOOTED_INCOMPAT}" == "true" ]]; then
INCOMPAT="true"
else
INCOMPAT="false"
fi

if [[ "${INCOMPAT}" == "true" ]]; then
rpm-ostree upgrade
else
sudo bootc upgrade
fi
fi

# Updates system Flatpaks
if flatpak remotes | grep -q system; then
flatpak update -y
fi
# Update user Flatpaks
if flatpak remotes | grep -q user; then
flatpak update --user -y
fi
# Guard Brew if the user does not own brew/doesn't exist
if [[ -O /var/home/linuxbrew/.linuxbrew/bin/brew ]]; then
# Upgrade will run brew update if needed
/var/home/linuxbrew/.linuxbrew/bin/brew upgrade -y
fi
# Yes, this runs as the regular, uupd ships a polkit rule
systemctl start --verbose uupd-manual.service

alias auto-update := toggle-updates

Expand Down