Skip to content

Commit

Permalink
feat: integrate uupd and install-system-flatpaks into ujust
Browse files Browse the repository at this point in the history
This should make it so we dont need the `Justfile` file on $HOME. It also updates some docs about the system-flatpaks recipe
  • Loading branch information
tulilirockz committed Jan 1, 2025
1 parent f85de7f commit 630b6a5
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 51 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This is not a 1:1 recreation, it's a minimal product, see below for more informa
### Installation and Caveats

1. Snag the ISO: [download.projectbluefin.io/achillobator.iso](https://download.projectbluefin.io/achillobator.iso)
2. On first boot, install flatpaks: `just install-system-flatpaks`
2. On first boot, install flatpaks: `ujust install-system-flatpaks`

[Incoming anaconda PR](https://github.com/rhinstaller/anaconda/pull/6056) for the flatpaks, also:

Expand Down
44 changes: 1 addition & 43 deletions system_files/usr/share/ublue-os/just/10-update.just
Original file line number Diff line number Diff line change
@@ -1,44 +1,2 @@
# vim: set ft=make :

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

alias auto-update := toggle-updates

# Turn automatic updates on or off
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
CURRENT_STATE="Enabled"
fi
OPTION={{ ACTION }}
if [ "$OPTION" == "prompt" ]; then
echo "Automatic updates are currently: ${bold}${CURRENT_STATE}${normal}"
echo "Enable or Disable automatic updates?"
OPTION=$(ugum choose Enable Disable)
elif [ "$OPTION" == "help" ]; then
echo "Usage: ujust toggle-updates <option>"
echo " <option>: Specify the quick option - 'enable' or 'disable'"
echo " Use 'enable' to Enable automatic updates."
echo " Use 'disable' to Disable automatic updates."
exit 0
fi
if [ "${OPTION,,}" == "enable" ]; then
sudo systemctl enable ublue-update.timer
elif [ "${OPTION,,}" == "disable" ]; then
sudo systemctl disable ublue-update.timer
fi

alias changelog := changelogs

# Show the changelog
changelogs:
rpm-ostree db diff --changelogs
pkexec uupd --log-level debug
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
[private]
default:
@just --choose

install-system-flatpaks:
#!/usr/bin/env bash
if ! flatpak remotes | grep -q flathub; then
flatpak remote-add --system flathub https://flathub.org/repo/flathub.flatpakrepo
fi
flatpak --system -y install --or-update $(curl -s https://raw.githubusercontent.com/ublue-os/bluefin/main/bluefin_flatpaks/flatpaks | tr '\n' ' ')
2 changes: 1 addition & 1 deletion system_files/usr/share/ublue-os/motd/template.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
| `ujust bluefin-cli` | Enable terminal bling |
| `brew help` | Manage command line packages |

NOTE: Use `just install-system-flatpaks` to finish the installation
NOTE: Use `ujust install-system-flatpaks` to finish the installation

- **󰊤** [Issues](https://issues.projectbluefin.io)
- **󰈙** [Documentation](http://docs.projectbluefin.io/)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env bash
set -x
VEN_ID="$(cat /sys/devices/virtual/dmi/id/chassis_vendor)"

# Ensure custom ptyxis theme is present
Expand Down

0 comments on commit 630b6a5

Please sign in to comment.