Drop the extension, and give the test suite a front door
Phase 6, the last of the fresh-install spec. 159 scripts lose their .sh: 110 contracts, 47 Vicinae commands, 2 compositor contracts. A shebang and the executable bit already select the interpreter. The extension only ever added something that had to stay in sync, and the rename proved the point twice over in the space of an hour. The spec's stated risk was Vicinae's script discovery. One script was renamed and reloaded on its own before the other 46 followed; it came back as scripts:panama.capture and all 47 resolve. What the probe turned up instead is that the extension was never only a filename: Vicinae's command IDs embed it, so every ID changed. Nothing in this repository refers to them, so nothing breaks. The only trace is Vicinae's metadata.json, whose visited map had two Panama entries that are now orphaned -- two commands lost their usage ranking and will earn it back. Worth knowing before anyone renames these again on a machine that has a keybind pointing at one. Rewriting the references by exact filename missed two things it structurally could not see: a name built from a variable, settings-$page.sh, and a glob, -name '*.sh'. Both were in the contract that counts the generated commands, which promptly reported 47 expected and 0 found. The mechanical part of a rename is the part that looks finished. The three subcommands. panama doctor fronts a health check that already existed and already ran at the end of every install but could not be reached from a terminal. panama upgrade re-runs the installer from anywhere. panama test runs the suite, which had no entry point at all -- 121 files that were the main safety net in this repository and were invisible in it. Writing that runner found three tests nothing was running. calendar_agenda_bridge_test, home_assistant_bridge_test and kdeconnect_bridge_test are unittest suites without the executable bit, so no contract invoked them and the first draft of the runner skipped them silently. All three pass, and have passed unobserved for weeks. The runner collects *_test.py as well now, because a runner with a blind spot is worse than no runner for the same reason a dependency checker with one is: it reports PASS. Six worktrees pruned. Each was re-checked rather than trusted to the spec's list, and two needed it: panama-commands is not on feat/panama-commands but on feat/gnome-tweaks-parity, and fix/panama-displays-review reads [ahead 3] -- ahead of its remote, not of main, with every commit patch-equivalent to landed work. roadmap-completion stays; it has five commits that are genuinely unlanded. The branches are left alone: pruning a worktree costs nothing, deleting a branch is a decision. 121 contracts pass. Claude-Session: https://claude.ai/code/session_01NvgBuSWB5sE43yWmg21ozj
This commit is contained in:
Executable
+88
@@ -0,0 +1,88 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Every GTK theme name Panama sets must be a theme that is actually installed.
|
||||
#
|
||||
# This exists because of a bug that was invisible for weeks. ColorScheme set
|
||||
# gtk-theme to "Adwaita-dark" for dark and "Adwaita" for light. Neither is
|
||||
# installed on Fedora 44 -- only adw-gtk3 and adw-gtk3-dark are -- and GTK
|
||||
# responds to an unknown theme name by silently falling back to its built-in
|
||||
# default, which is LIGHT.
|
||||
#
|
||||
# So light mode appeared to work, dark mode produced light windows, and nothing
|
||||
# anywhere reported an error. Applications that take their cue from the GTK
|
||||
# theme rather than the portal -- Chromium and Electron among them -- were stuck
|
||||
# light with no way to diagnose it from inside the application.
|
||||
#
|
||||
# The failure is silent by construction, so it needs a test rather than a
|
||||
# comment. Checks the compositor-facing setting and the generated GTK config
|
||||
# agree, and that both name something real.
|
||||
|
||||
set -uo pipefail
|
||||
|
||||
repo_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
|
||||
color_scheme="$repo_dir/config/dot/quickshell/services/ColorScheme.qml"
|
||||
theme_apps="$repo_dir/config/dot/quickshell/scripts/panama-theme-apps"
|
||||
|
||||
fail() {
|
||||
printf 'gtk theme contract: %s\n' "$1" >&2
|
||||
exit 1
|
||||
}
|
||||
|
||||
theme_installed() {
|
||||
local name="$1" dir
|
||||
for dir in /usr/share/themes "$HOME/.themes" "$HOME/.local/share/themes"; do
|
||||
[[ -d "$dir/$name/gtk-3.0" ]] && return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
# ── The names ColorScheme sets must exist ────────────────────────────────────
|
||||
names="$(grep -oE 'root\.dark \? "[a-zA-Z0-9-]+" : "[a-zA-Z0-9-]+"' "$color_scheme" \
|
||||
| grep -oE '"[a-zA-Z0-9-]+"' | tr -d '"' | grep -E '^adw-|^Adwaita' | sort -u)"
|
||||
[[ -n "$names" ]] || fail 'could not find the GTK theme names in ColorScheme.qml -- this contract is not reading it correctly'
|
||||
|
||||
while read -r name; do
|
||||
[[ -n "$name" ]] || continue
|
||||
theme_installed "$name" \
|
||||
|| fail "ColorScheme sets gtk-theme to \"$name\", which is not installed. GTK falls back to its light default when a theme is missing, so this produces light windows in dark mode with no error anywhere."
|
||||
done <<<"$names"
|
||||
|
||||
# ── The generated GTK config must agree, in both directions ──────────────────
|
||||
# Generated into a fixture rather than the live config, so running this cannot
|
||||
# retheme the desktop it is running on.
|
||||
fixture="$(mktemp -d /tmp/panama-gtk-theme.XXXXXX)"
|
||||
trap 'rm -rf "$fixture"' EXIT
|
||||
|
||||
for version in 3.0 4.0; do
|
||||
mkdir -p "$fixture/gtk-$version"
|
||||
cp "$repo_dir/config/dot/gtk-$version/settings.ini.template" "$fixture/gtk-$version/" \
|
||||
|| fail "gtk-$version has no settings.ini.template -- the generated file would never be produced"
|
||||
done
|
||||
|
||||
for scheme in dark light; do
|
||||
XDG_CONFIG_HOME="$fixture" "$theme_apps" "$scheme" >/dev/null 2>&1
|
||||
|
||||
for version in 3.0 4.0; do
|
||||
generated="$fixture/gtk-$version/settings.ini"
|
||||
[[ -r "$generated" ]] || fail "gtk-$version settings.ini was not generated for $scheme"
|
||||
|
||||
grep -q '@GTK_THEME@\|@PREFER_DARK@' "$generated" \
|
||||
&& fail "gtk-$version settings.ini still contains an unsubstituted placeholder for $scheme"
|
||||
|
||||
theme="$(sed -n 's/^gtk-theme-name=//p' "$generated")"
|
||||
prefer="$(sed -n 's/^gtk-application-prefer-dark-theme=//p' "$generated")"
|
||||
|
||||
theme_installed "$theme" \
|
||||
|| fail "gtk-$version settings.ini names \"$theme\" for $scheme, which is not installed"
|
||||
|
||||
if [[ "$scheme" == "dark" ]]; then
|
||||
[[ "$prefer" == "1" ]] || fail "gtk-$version asks for prefer-dark=$prefer in dark mode"
|
||||
[[ "$theme" == *dark* ]] || fail "gtk-$version uses \"$theme\" in dark mode, which is not a dark theme"
|
||||
else
|
||||
[[ "$prefer" == "0" ]] || fail "gtk-$version asks for prefer-dark=$prefer in light mode"
|
||||
[[ "$theme" != *dark* ]] || fail "gtk-$version uses \"$theme\" in light mode, which is a dark theme"
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
printf 'gtk theme contract: PASS\n'
|
||||
Reference in New Issue
Block a user