Richer color handling in timed_prompt (formerly warning_prompt)

Author: ahesford

90zfsbootmenu/zfsbootmenu-lib.sh

@@ -729,35 +729,45 @@ has_resume_device() {
   return 1
 }
 
-# arg1: warning message
-# arg2: persistence in seconds (optional, default 30)
+# arg1..argN: lines of warning message
 # prints: warning message
-# returns: nothing
+# returns: 1 if user pressed ESC, 0 otherwise
 
-warning_prompt() {
-  local prompt x y
+timed_prompt() {
+  local prompt x y cnum
 
   [ $# -gt 0 ] || return
   [ -n "${delay}" ] || delay="30"
   [ -n "${prompt}" ] || prompt="Press [ENTER] or wait %0.2d seconds to continue"
 
+  # shellcheck disable=SC2154
+  case "${color}" in
+    red) cnum=1 ;;
+    green) cnum=2 ;;
+    yellow) cnum=3 ;;
+    blue) cnum=4 ;;
+    magenta) cnum=5 ;;
+    cyan) cnum=6 ;;
+    *) cnum="" ;;
+  esac
+
   tput civis
   HEIGHT=$( tput lines )
   WIDTH=$( tput cols )
   tput clear
 
   x=$(( (HEIGHT - 0) / 2))
 
+  [ -n "${cnum}" ] && tput setaf "${cnum}"
   while [ $# -gt 0 ]; do
     local line=${1}
     y=$(( (WIDTH - ${#line}) / 2 ))
     tput cup $x $y
-    line="${line//\[/\\033\[0;32m\[}"
-    line="${line//\]/\]\\033\[0m}"
     echo -n -e "${line}"
     x=$(( x + 1 ))
     shift
   done
+  [ -n "${cnum}" ] && tput sgr0
 
   IFS=''
   for (( i=delay; i>0; i-- )); do
@@ -853,8 +863,8 @@ set_rw_pool() {
   pool="${1}"
   [ -n "${pool}" ] || return 1
 
-  if [ -r "${BASE}/degraded" ] && grep -q "${pool}" "${BASE}/degraded"; then
-    warning_prompt "Operation prohibited: ZFSBootMenu cannot import '${pool}' read-write" "10"
+  if grep -q "${pool}" "${BASE}/degraded" >/dev/null 2>&1; then
+    color=red delay=10 timed_prompt "Operation prohibited" "Pool '${pool}' cannot be imported read-write"
     return 1
   fi
 

90zfsbootmenu/zfsbootmenu.sh

@@ -102,7 +102,7 @@ while IFS=$'\t' read -r _pool _property; do
 done <<<"$( zpool get all -H -o name,property )"
 
 if [ "${unsupported}" -ne 0 ]; then
-  warning_prompt "Unsupported features detected, upgrade ZFS modules in ZFSBootMenu"
+  color=red timed_prompt "Unsupported features detected" "Upgrade ZFS modules in ZFSBootMenu"
 fi
 
 # Attempt to find the bootfs property
@@ -121,7 +121,7 @@ if [[ -n "${BOOTFS}" ]]; then
   # Draw a countdown menu
   # shellcheck disable=SC2154
   if [[ ${menu_timeout} -gt 0 ]]; then
-    if delay=10 prompt="Booting in %0.2d seconds" warning_prompt "[ENTER] to boot ${BOOTFS}" "[ESC] boot menu" ; then
+    if delay="${menu_timeout}" prompt="Booting in %0.2d seconds" timed_prompt "[ENTER] to boot ${BOOTFS}" "[ESC] boot menu" ; then
       # Clear screen before a possible password prompt
       tput clear
       if ! key_wrapper "${BOOTFS}" ; then
@@ -262,8 +262,8 @@ while true; do
             if [ "${leftover_space}" -le 0 ]; then
               avail_space="$( zfs list -H -o available "${selected_snap%/*}" )"
               be_size="$( zfs list -H -o refer "${selected_snap}" )"
-              delay=10 warning_prompt "Insufficient space in '${selected_snap%/*}' for duplication" \
-                "${avail_space} available, ${be_size} needed"
+              color=red delay=10 timed_prompt "Insufficient space for duplication" \
+                "'${selected_snap%/*}' has ${avail_space} free but needs ${be_size}"
               continue
             fi
           ;;