feat: Support non-Ublue images

Author: gmpinder

modules/justfiles/README.md

@@ -1,14 +1,18 @@
 # `justfiles`
 
-:::note
-The module is only compatible with Universal Blue images.
-:::
-
-The `justfiles` module makes it easy to include [just](https://just.systems/) recipes from multiple files in Universal Blue -based images. It can be useful for example when utilizing DE-specific justfiles when building multiple images. On the other hand, you likely wont need the module if you're building just one image or need just one justfile for all your images.
+The `justfiles` module makes it easy to include [just](https://just.systems/) recipes from multiple files. It can be useful for example when utilizing DE-specific justfiles when building multiple images. On the other hand, you likely wont need the module if you're building just one image or need just one justfile for all your images.
 
 ## What is just ?
 
-Just is a command runner (kind of like make) that can be used to supply arbitrary scripts under a single shell command. Images based on Universal Blue bundle a set of these scripts, called recipes, which can be accessed with the `ujust` command.
+Just is a command runner (kind of like make) that can be used to supply arbitrary scripts under a single shell command.
+
+### `blujust`
+
+The `blujust` command will be installed if `ujust` is not detected. This will allow base image maintainers to take advantage of the pattern popularized by Ublue without having to directly depend on their images.
+
+### `ujust`
+
+Images based on Universal Blue bundle a set of these scripts, called recipes, which can be accessed with the `ujust` command.
 
 For more information, refer to these links:
 

modules/justfiles/blujust

@@ -0,0 +1,3 @@
+#!/usr/bin/bash
+
+/usr/bin/just --justfile /usr/share/bluebuild/justfile "${@}"

modules/justfiles/blujust_files/just/00-default.just

@@ -0,0 +1,70 @@
+uid := `id -u`
+shell := `grep :$(id -u): /etc/passwd | cut -d: -f7`
+
+# Boot into this device's BIOS/UEFI screen
+bios:
+    #!/usr/bin/bash
+    if [ -d /sys/firmware/efi ]; then
+      systemctl reboot --firmware-setup
+    else
+      echo "Rebooting to legacy BIOS from OS is not supported."
+    fi
+
+# Show BIOS info
+bios-info:
+    #!/usr/bin/bash
+    echo "Manufacturer: $(sudo dmidecode -s baseboard-manufacturer)"
+    echo "Product Name: $(sudo dmidecode -s baseboard-product-name)"
+    echo "Version: $(sudo dmidecode -s bios-version)"
+    echo "Release Date: $(sudo dmidecode -s bios-release-date)"
+
+# Show all messages from this boot
+logs-this-boot:
+    sudo journalctl --no-hostname -b 0
+
+# Show all messages from last boot
+logs-last-boot:
+    sudo journalctl --no-hostname -b -1
+
+# Check for local overrides
+check-local-overrides:
+    #!/usr/bin/bash
+    diff -r \
+      --suppress-common-lines \
+      --color="always" \
+      --exclude "passwd*" \
+      --exclude "group*" \
+      --exclude="subgid*" \
+      --exclude="subuid*" \
+      --exclude="machine-id" \
+      --exclude="adjtime" \
+      --exclude="fstab" \
+      --exclude="system-connections" \
+      --exclude="shadow*" \
+      --exclude="gshadow*" \
+      --exclude="ssh_host*" \
+      --exclude="cmdline" \
+      --exclude="crypttab" \
+      --exclude="hostname" \
+      --exclude="localtime" \
+      --exclude="locale*" \
+      --exclude="*lock" \
+      --exclude=".updated" \
+      --exclude="*LOCK" \
+      --exclude="vconsole*" \
+      --exclude="00-keyboard.conf" \
+      --exclude="grub" \
+      --exclude="system.control*" \
+      --exclude="cdi" \
+      --exclude="default.target" \
+      /usr/etc /etc 2>/dev/null | sed '/Binary\ files\ /d'
+
+# Gather device info to a pastebin
+device-info:
+    #!/usr/bin/bash
+    fpaste <(rpm-ostree status) <(fpaste --sysinfo --printonly) <(flatpak list --columns=application,version,options)
+
+# Measure Idle Power Draw
+check-idle-power-draw:
+    #!/usr/bin/bash
+    sudo powerstat -a -r

modules/justfiles/blujust_files/justfile

@@ -0,0 +1,10 @@
+set allow-duplicate-recipes := true
+set ignore-comments := true
+
+_default:
+    #!/usr/bin/bash
+    /usr/bin/blujust --list --list-heading $'Available commands:\n' --list-prefix $' - '
+
+# Imports
+import "/usr/share/ublue-os/just/00-default.just"
+import? "/usr/share/ublue-os/just/60-custom.just"

modules/justfiles/justfiles.sh

@@ -4,8 +4,32 @@ set -euo pipefail
 
 get_json_array CONFIG_SELECTION 'try .["include"][]' "$1"
 VALIDATE="$(echo "$1" | jq -r 'try .["validate"]')"
+INSTALL="$(echo "$1" | jq -r 'try .["install"]')"
+
+if [ "${INSTALL}" = "true" ] && ! rpm -q just > /dev/null; then
+    if command -v dnf5 > /dev/null; then
+        dnf5 -y install just
+    elif command -v dnf4 > /dev/null; then
+        dnf4 -y install just
+    else
+        echo "No recognizable package manager! Expected dnf4 or dnf5."
+        exit 1
+    fi
+fi
 
-IMPORT_FILE="/usr/share/ublue-os/just/60-custom.just"
+if [ -x /usr/bin/ujust ]; then
+    IMPORT_FILE="/usr/share/ublue-os/just/60-custom.just"
+else
+    # Install blujust files
+    if ! [ -f /usr/bin/blujust ]; then
+        cp -f "${MODULE_DIRECTORY}/justfiles/blujust" /usr/bin/blujust
+        chmod +x /usr/bin/blujust
+
+        mkdir -p /usr/share/bluebuild/
+        cp -fr "${MODULE_DIRECTORY}/justfiles/blujust_files/*" /usr/share/bluebuild/
+    fi
+    IMPORT_FILE="/usr/share/bluebuild/just/60-custom.just"
+fi
 CONFIG_FOLDER="${CONFIG_DIRECTORY}/justfiles"
 DEST_FOLDER="/usr/share/bluebuild/justfiles"
 

modules/justfiles/justfiles.tsp

@@ -18,4 +18,7 @@ model JustfilesModuleV1 {
 
   /** List of files or subfolders to include into this image. If omitted, all justfiles will be included. */
   include?: Array<string>;
+
+  /** Install `just` via the package manager. * */
+  install?: boolean = false;
 }

modules/justfiles/module.yml

@@ -3,6 +3,7 @@ shortdesc: The justfiles module makes it easy to include just recipes from multi
 example: |
   type: justfiles
   validate: true
+  install: true
   include:
     - common
     - gnome/monitors.just