Merge pull request #282 from outis1one/claude/ionos-script-integration-x32ofw

Drop the header row, tighten name-to-count spacing
This commit is contained in:
Outis
2026-08-10 12:50:13 -04:00
committed by GitHub
+13 -27
View File
@@ -420,9 +420,7 @@ while true; do
_term_cap=$((_term_lines - 10)) _term_cap=$((_term_lines - 10))
[ "$_term_cap" -lt 6 ] && _term_cap=6 [ "$_term_cap" -lt 6 ] && _term_cap=6
[ "$_list_h" -gt "$_term_cap" ] && _list_h="$_term_cap" [ "$_list_h" -gt "$_term_cap" ] && _list_h="$_term_cap"
# +9 instead of +8: the instructional text above the list is now two _box_h=$((_list_h + 8))
# lines (column header + the Space/Enter hint) instead of one.
_box_h=$((_list_h + 9))
[ "$_box_h" -gt "$((_term_lines - 2))" ] && _box_h=$((_term_lines - 2)) [ "$_box_h" -gt "$((_term_lines - 2))" ] && _box_h=$((_term_lines - 2))
# Was a flat 78 regardless of actual terminal size — descriptions # Was a flat 78 regardless of actual terminal size — descriptions
# got cut off mid-sentence on any terminal wider than that, with no # got cut off mid-sentence on any terminal wider than that, with no
@@ -433,40 +431,28 @@ while true; do
[ "$_box_w" -lt 78 ] && _box_w=78 [ "$_box_w" -lt 78 ] && _box_w=78
[ "$_box_w" -gt 160 ] && _box_w=160 [ "$_box_w" -gt 160 ] && _box_w=160
# whiptail's checklist has exactly one interactive element per row — # A real column header (distinct from the checklist's rows) would
# the checkbox itself, drawn for every row with no way to suppress # need to sit flush against the top of the list box, but whiptail
# it on any single one. There's no such thing as a non-selectable # always renders a blank line between the instructional text and
# row inside the list. The instructional text ABOVE the list has no # the list itself — confirmed by actually rendering this dialog
# checkbox at all though (it's not a list item, just a text field), # into a captured pty and inspecting the character grid; there's no
# so that's where the column header lives — genuinely non-selectable # parameter that removes that gap. So the header idea is dropped in
# this way, not just harmless-if-selected like a fake row would be. # favor of keeping "installed"/count directly legible in each row
# # without one, and just keeping the name close behind the count.
# The header text ("installed" / "# of installs" / "service") is
# wider than the underlying data (an "x"-or-blank mark, a 1-2 digit
# count), so it's the DATA fields that were widened to match the
# header labels' widths (9 and 13 chars) rather than the other way
# around — a narrow data column can't align under a wide label and
# stay readable, but a wide data column can absolutely align under
# a matching-width label. Verified pixel/character-exact (not
# eyeballed) by actually rendering this dialog into a captured pty
# and measuring column offsets with pyte; the leading spaces on the
# header line and the field widths below are tuned to that
# measurement, not guessed.
svc_items=() svc_items=()
for name in "${SVCS[@]}"; do for name in "${SVCS[@]}"; do
_inst_field="$(printf '%-9s' '')" _inst_field="$(printf '%-9s' '')"
_count_field="$(printf '%-13s' '')" _count_field="$(printf '%-2s' '')"
_count="$(install_count "$name")" _count="$(install_count "$name")"
if [ "$_count" -gt 0 ]; then if [ "$_count" -gt 0 ]; then
_inst_field="installed" _inst_field="installed"
_count_field="$(printf '%-13s' "$_count")" _count_field="$(printf '%-2s' "$_count")"
fi fi
svc_tag="$(printf "%s %s %s" "$_inst_field" "$_count_field" "$name")" svc_tag="$(printf "%s %s %s" "$_inst_field" "$_count_field" "$name")"
svc_items+=("$svc_tag" "${SERVICE_DESC[$name]}" "OFF") svc_items+=("$svc_tag" "${SERVICE_DESC[$name]}" "OFF")
done done
CHOICE=$(whiptail --title "${CHOSEN_CAT^^}" --checklist \ CHOICE=$(whiptail --title "${CHOSEN_CAT^^}" --checklist \
" installed # of installs service "Space to select, Enter to install:" "$_box_h" "$_box_w" "$_list_h" \
Space=select to install, Enter=go:" "$_box_h" "$_box_w" "$_list_h" \
"${svc_items[@]}" 3>&1 1>&2 2>&3 </dev/tty) || continue "${svc_items[@]}" 3>&1 1>&2 2>&3 </dev/tty) || continue
eval "SELECTED=($CHOICE)" eval "SELECTED=($CHOICE)"
# Undo the display-only "x N " prefix — name is always the last # Undo the display-only "x N " prefix — name is always the last