Skip to content

fix(x11): desktop-skin --plate og parse #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
FineComputer14451 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(x11): desktop-skin --plate og parse #28

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
513052f
fix(x11): allow --plate og space-form in desktop-skin
FineComputer14451 Sep 7, 2026
88ad67f
fix(x11): desktop-skin self-test under empty DISPLAY
FineComputer14451 Sep 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 26 additions & 5 deletions scripts/desktop-skin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,53 +73,70 @@ Does not edit /usr. Does not print or request API keys.
EOF
}

# First pass: =form flags and switches. Bare --plate/--dpi/--panel-size
# are filled in the second pass (--plate og).
_need_plate=0
_need_dpi=0
_need_panel_size=0
for arg in "$@"; do
case "${arg}" in
--plate)
die "--plate requires a value (use --plate=og or pass after parse)"
_need_plate=1
;;
--plate=*)
PLATE="${arg#--plate=}"
_need_plate=0
;;
--dpi)
die "--dpi requires a value (use --dpi=120)"
_need_dpi=1
;;
--dpi=*)
DPI="${arg#--dpi=}"
_need_dpi=0
;;
--terminal) DO_TERMINAL=1 ;;
--panel-slim) DO_PANEL_SLIM=1 ;;
--panel-size)
die "--panel-size requires a value (use --panel-size=32)"
_need_panel_size=1
;;
--panel-size=*)
PANEL_SIZE="${arg#--panel-size=}"
_need_panel_size=0
;;
--dry-run) DRY=1 ;;
--help|-h)
usage
exit 0
;;
*)
# allow: --plate og --dpi 120
:
;;
esac
done

# Positional-style flags: --plate og --dpi 120
# Second pass: space-separated values (--plate og). Reject another flag as value.
_prev=""
for arg in "$@"; do
if [[ "${_prev}" == "--plate" ]]; then
[[ "${arg}" != -* ]] || die "--plate requires a value (use --plate=og or --plate og)"
PLATE="${arg}"
_need_plate=0
elif [[ "${_prev}" == "--dpi" ]]; then
[[ "${arg}" != -* ]] || die "--dpi requires a value (use --dpi=120 or --dpi 120)"
DPI="${arg}"
_need_dpi=0
elif [[ "${_prev}" == "--panel-size" ]]; then
[[ "${arg}" != -* ]] || die "--panel-size requires a value (use --panel-size=32 or --panel-size 32)"
PANEL_SIZE="${arg}"
_need_panel_size=0
fi
_prev="${arg}"
done

[[ "${_need_plate}" -eq 0 ]] || die "--plate requires a value (use --plate=og or --plate og)"
[[ "${_need_dpi}" -eq 0 ]] || die "--dpi requires a value (use --dpi=120 or --dpi 120)"
[[ "${_need_panel_size}" -eq 0 ]] || die "--panel-size requires a value (use --panel-size=32 or --panel-size 32)"

run() {
if [[ "${DRY}" -eq 1 ]]; then
printf '[desktop-skin] DRY:'
Expand Down Expand Up @@ -603,6 +620,10 @@ cmd_self_test() {
info "tokens OK"
[[ "${PANEL_SIZE}" == "32" ]] || die "default panel size drift"
case "og" in og|banner|minimal) ;; *) die "plate case broken" ;; esac
# space-form parse must not die early (regression: bare --plate died in first pass)
# CI has no X; require_session only checks DISPLAY is non-empty
out="$(DISPLAY=:0 bash "${BASH_SOURCE[0]}" apply --plate og --dpi 120 --dry-run 2>&1)" || true
printf '%s\n' "${out}" | grep -q 'Theme Kali-Dark' || die "space-form --plate og parse failed"
info "self-test OK"
}

Expand Down
Loading