Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-11-02 19:02:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(update): confirm with Yes focused and keep the package list aligned

Browse Source
This commit is contained in:
MacRimi
2026-10-28 17:24:14 +01:00
parent 52d44a7435
commit 8ee3b29991
14 changed files with 123 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/global/common-functions.sh
+52 -3
View File
@@ -445,19 +445,68 @@ cleanup_duplicate_repos() {
# an operator reads the log days later to find out what moved.
# Reads `apt list --upgradable` on stdin and writes one aligned
# `name old → new` line per package. Lines that do not carry the
# `name old → new` line per package, never wider than the dialog that
# shows it (70 columns by default): a package whose versions do not fit
# continues on indented lines. Lines that do not carry the
# "[upgradable from: …]" part are passed through as they came.
pmx_format_upgradable() {
awk 'NF == 0 { next }
awk -v width="${1:-70}" 'NF == 0 { next }
$0 ~ /\[upgradable from: / {
name = $1; sub(/\/.*/, "", name)
from = $6; sub(/\]$/, "", from)
printf " %-30s %s → %s\n", name, from, $2
# Widths are counted by hand: " → " is three columns but more
# bytes, and mawk measures bytes.
if (2 + 30 + 1 + length(from) + 3 + length($2) <= width && length(name) <= 30)
printf " %-30s %s → %s\n", name, from, $2
else if (6 + length(from) + 3 + length($2) <= width)
printf " %s\n %s → %s\n", name, from, $2
else
printf " %s\n %s\n → %s\n", name, from, $2
next
}
{ print " " $0 }'
}
# Asks whether to go ahead with an update, with Yes focused so Enter
# confirms. whiptail cannot focus a button while its text scrolls, so the
# box takes the height of the terminal and a list that does not fit ends
# with a line counting the packages left out; the update log keeps them all.
#
# pmx_confirm_update TITLE TEXT LIST QUESTION
pmx_confirm_update() {
local title="$1" text="$2" list="$3" question="$4"
local rows height room shown more
rows=$(tput lines 2>/dev/null)
[[ "$rows" =~ ^[0-9]+$ ]] || rows=24
height=$(( rows > 50 ? 48 : rows - 2 ))
(( height < 16 )) && height=16
# Frame, padding, the heading, the question and the buttons.
room=$(( height - 9 - $(printf '%b' "$text" | grep -c '') ))
(( room < 3 )) && room=3
# A package that spans several lines is shown whole or counted.
shown=$(printf '%s\n' "$list" | awk -v room="$room" '
/^ [^ ]/ { package++ }
{ lines[NR] = $0; owner[NR] = package }
END {
if (NR <= room) { for (i = 1; i <= NR; i++) print lines[i]; exit }
# One line is kept for the count of the packages left out.
cap = room - 1
last = owner[cap]
if (owner[cap + 1] == last) last--
for (i = 1; i <= NR && owner[i] <= last; i++) print lines[i]
printf "\n%d\n", package - last
}')
more="${shown##*$'\n'}"
if [[ "$shown" == *$'\n\n'"$more" && "$more" =~ ^[0-9]+$ ]]; then
shown="${shown%$'\n\n'"$more"}"
shown+="\n … ${more} $(translate "more packages; the full list is in the update log")"
fi
whiptail --title "$title" --yesno \
"${text}$(translate "Packages to be upgraded"):\n${shown}\n\n${question}" "$height" 78
}
# Writes what dpkg actually did since `$1` (a "YYYY-MM-DD HH:MM:SS"
# stamp taken before the upgrade). dpkg's own log is the authoritative
# record of the transaction — it carries both versions of every package