Mirrors/ProxMenux
1
0
Fork 0
mirror of https://github.com/MacRimi/ProxMenux.git synced 2026-09-29 18:16:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(tui): use complete messages for device, path and package counts

Browse Source
This commit is contained in:
martino
2026-09-21 20:37:01 +02:00
parent 5dffb5cb88
commit db8cc2267a
3 changed files with 226 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/backup_restore/backup_host.sh
+12 -2
View File
@@ -919,7 +919,11 @@ _bk_manage_extra_paths() {
if (( count == 0 )); then
preview="$(hb_translate "You haven't added any custom paths yet.")"
else
preview="$(hb_translate "Currently"): \Zb\Z4${count}\Zn $(hb_translate "custom path(s) saved.")"
preview="$(hb_translate "Custom paths currently saved: {count}.")"
if [[ "$preview" != *'{count}'* ]]; then
preview="Custom paths currently saved: {count}."
fi
preview="${preview//\{count\}/"\Zb\Z4${count}\Zn"}"
fi
preview+=$'\n\n'"$(hb_translate "Custom paths are included in BOTH default and custom backup profiles.")"
@@ -3878,7 +3882,13 @@ _rs_run_complete_extras() {
"${installable[@]}" >>"$apt_log" 2>&1
local apt_rc=$?
if (( apt_rc == 0 )); then
msg_ok "$(translate "Installed:") ${#installable[@]} $(translate "packages.")"
local installed_message
installed_message="$(translate "Packages installed: {count}.")"
if [[ "$installed_message" != *'{count}'* ]]; then
installed_message="Packages installed: {count}."
fi
installed_message="${installed_message//\{count\}/${#installable[@]}}"
msg_ok "$installed_message"
else
msg_warn "$(translate "apt-get exited") ${apt_rc} — $(translate "see log:") $apt_log"
fi
scripts/storage/add_controller_nvme_vm.sh
+8 -1
View File
@@ -694,7 +694,14 @@ apply_assignment() {
echo -e "${TAB}${BL}Log: ${LOG_FILE}${CL}"
if [[ "$assigned_count" -gt 0 ]]; then
msg_ok "$(translate "Completed.") $assigned_count $(translate "device(s) added to VM") ${SELECTED_VMID}."
local completed_message
completed_message="$(translate "Completed. Devices added to VM {vmid}: {count}.")"
if [[ "$completed_message" != *'{vmid}'* || "$completed_message" != *'{count}'* ]]; then
completed_message="Completed. Devices added to VM {vmid}: {count}."
fi
completed_message="${completed_message//\{vmid\}/$SELECTED_VMID}"
completed_message="${completed_message//\{count\}/$assigned_count}"
msg_ok "$completed_message"
else
msg_warn "$(translate "No new Controller/NVMe entries were added.")"
fi