generated from ublue-os/image-template
-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: integrate uupd and install-system-flatpaks into ujust
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
1 parent
f85de7f
commit 630b6a5
Showing
5 changed files
with
3 additions
and
51 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
5 changes: 0 additions & 5 deletions
5
system_files/etc/skel/Justfile → ...es/usr/share/ublue-os/just/60-custom.just
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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' ' ') | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
system_files/usr/share/ublue-os/user-setup.hooks.d/10-theming.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters