Repository navigation
feat(cli): bluefin-cli runs the shell experience, uwelcome stays the greeting - #1370
Conversation
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: hanthor The full list of commands accepted by this bot can be found here. Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
There was a problem hiding this comment.
Summary: This change moves Utah's terminal setup (shell shortcuts, prompt and command-line tool bundles) to a newer tool called bluefin-cli. The old setup commands keep working, and they now call bluefin-cli for you. The standard welcome message when a terminal opens stays as it is. I found no blocking problems. One small safeguard is suggested below: it stops a possible endless loop if the old setup command ever comes back.
correctness (low, advisory)
Utah still ships the vendored Dakota recipe that calls the old command (system_files/shared/usr/share/ublue-os/just/system.just:16-18, bluefin-cli: → @ublue-bling). The new ublue-bling shim runs exec ujust bluefin-cli (system_files/shared/usr/bin/ublue-bling:4). Today the override in 60-custom.just:112-137 shadows the vendored recipe, and the just ≥ 1.56 floor in tests/test_ujust_overrides.py:19-23 keeps that true. If the override ever stops winning again, the two would call each other forever. #449 shows this has happened before. See the inline suggestion for a one-line guard.
What I checked: the recipe's rc paths ($HOME/.bashrc, $HOME/.zshrc, $HOME/.config/fish/config.fish) match bluefin-cli's own (internal/shell/shells.go:55-69). The marker it greps is bluefin-cli's shellMaker (internal/shell/shell.go:32). bluefin-cli shell … on|off removes the lines the old ublue-bling wrote (internal/shell/shell.go:80-89), so old rc files migrate cleanly. bluefin-cli's init script has its own load-once guard (internal/shell/resources/shell.sh:12), so the shim plus a new rc line cannot initialise twice. The Containerfile:233-238 copy order puts Utah's shims over Common's files. The contract run at this head passed. I did not boot an image, and bluefin-cli is still listed as unavailable, so the shims' runtime path is unverified.
No findings from: security, intent-alignment, style, docs-currency.
Confidence: 5/5 (safe)
-- hive: agent=reviewer backend=claude model=claude-opus-5-5 effort=medium claude=2.1.327
| #!/usr/bin/bash | ||
| # Compatibility shim: on Utah, bluefin-cli replaces Universal Blue's | ||
| # ublue-bling. The old command still turns the terminal experience on or off. | ||
| exec ujust bluefin-cli |
There was a problem hiding this comment.
correctness (low): The vendored system.just:16-18 recipe bluefin-cli still calls ublue-bling. If the 60-custom.just override ever stops shadowing it (the precedence regression in #449), this shim and that recipe would call each other forever. A guard turns that into a clear error:
| exec ujust bluefin-cli | |
| if [[ -n "${UTAH_BLING_SHIM:-}" ]]; then | |
| echo 'error: ujust bluefin-cli resolved to the old ublue-bling recipe' >&2 | |
| exit 1 | |
| fi | |
| UTAH_BLING_SHIM=1 exec ujust bluefin-cli |
|
Hive status — updated in place; edits do not notify. Full history is in the Activity Monitor. Review findings from Looks correct to me, with one consequence worth confirming before merge. What I verified against the tree at
Interim regression (declared in the body, stating the concrete effect):
The Minor, not blocking: Common's |
|
@hanthor this PR is back in your court ( Review asks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Queued in your relay fix queue (8 waiting): fixes are handed out before new work as soon as you have capacity. |
ba34a58 to
943da67
Compare
943da67 to
fc411ac
Compare
…greeting bluefin-cli (tuna-os/bluefin-cli) replaces Common's ublue-bling and bling.sh/bling.fish (projectbluefin/common#1719): - `ujust bluefin-cli` (60-custom.just) turns bluefin-cli's shell experience on, installing the cli bundle, or off when the rc file carries bluefin-cli's line. It explains a missing binary. - bling.sh, bling.fish and ublue-bling become shims, so rc files and muscle memory that still call bling get bluefin-cli. The contract pins them. - configure-services.sh removes env.sh and bash-preexec-rearm.sh, which only Common's bling read; bluefin-cli keeps bash-preexec armed itself. uwelcome stays the terminal greeting, with `ujust toggle-user-motd`, Utah's interactive-shell guard and Dakota's bluefin-shell-defaults.sh unchanged. bluefin-cli works through uwelcome where it is installed (tuna-os/bluefin-cli#527). bluefin-cli is [unavailable] until the factory publishes it (projectbluefin/utah-packages#1235); the shims then do nothing. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
fc411ac to
e7958a2
Compare
Dakota ships open-iscsi and open-isns, so Utah installs iscsi-initiator-utils and isns-utils from the factory, with every unit off. 85-utah-desktop.preset already carries Dakota's 50-iscsi.preset. Fedora's package adds iscsi-starter.service and iscsi-onboot.service, and Hummingbird's 90-default.preset enables both, so the preset now disables them as well. The contract's disabled list asserts all nine units. clean-stage strips /var, so tmpfiles.d/utah-iscsi.conf recreates the node database directories with the RPMs' modes and policy labels. nicstat is now published by the pinned factory and installed. umotd is waived: uwelcome is Utah's terminal greeting, and bluefin-cli works through it (#1370). erofs-utils stays planned, blocked on libqpl (projectbluefin/utah-packages#1238). Closes #1360. Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
bluefin-cli takes over Utah's shell experience (shell tools, prompt hooks and the command-line Homebrew bundles) from Common's
ublue-blingandbling.sh/bling.fish. uwelcome stays the terminal greeting: bluefin-cli integrates it (tuna-os/bluefin-cli#527). Utah is the reference for projectbluefin/common#1719.What changes
ujust bluefin-cli(60-custom.just) overrides Dakota's recipe (ublue-bling+cli.Brewfile): it runsbluefin-cli shell <shell> onandbluefin-cli install cli, oroffwhen the rc file already has bluefin-cli's marker line. With no binary it says so instead ofcommand not found.bling.sh,bling.fishandublue-blingbecome shims that run bluefin-cli, so old rc lines and muscle memory keep working. The desktop contract pins them.configure-services.shremovesenv.shandbash-preexec-rearm.sh, which only Common's bling read; bluefin-cli keeps bash-preexec armed itself.desktop-contract/references/bluefin-cli.md(old → new mapping),package-contract/references/ujust.md, README counts.What stays
uwelcome.sh,fish_greeting.fish,/etc/uwelcome, Utah's interactive-shell guard andujust toggle-user-motd(feat(dakota): structural parity and quick wins (folded #1284…#1300, #1278…#1289) #1309'stest_toggle_user_motd_drives_uwelcomeis kept). Where uwelcome is installed,bluefin-cli motd show|toggledrive uwelcome and bluefin-cli's init greets only through it, once per terminal.bluefin-shell-defaults.sh.Package
bluefin-cliis in[unavailable]with projectbluefin/utah-packages#1235 (the factory recipe) as its tracker: until the pinned factory carries it, the shims do nothing andujust bluefin-clisays it is missing. It moves to[parity]and[factory].parityonce a factory pin bump with it lands. Unavailable count 9 → 10.Tests
tests/test_ujust_overrides.py: the recipe turns the shell on and installs the bundle, turns a managed shell off, refuses an unsupported shell, explains a missing binary.tests/test_desktop_contract.py: shims shipped and pinned; only the two bling helpers removed, uwelcome untouched.just checkpasses locally (rebased on main after feat(dakota): structural parity and quick wins (folded #1284…#1300, #1278…#1289) #1309, feat(config): install Dakota's and GNOME OS's config subpackages #1297, feat(auth): oo7 replaces gnome-keyring, as on Dakota #1304 and feat(console): kmscon on the VTs, as on GNOME OS and Dakota #1306).