=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- openbsd/fw_update/fw_install.sh 2021/12/19 04:05:25 1.89 +++ openbsd/fw_update/fw_install.sh 2021/12/19 19:16:55 1.90 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.89 2021/12/19 04:05:25 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.90 2021/12/19 19:16:55 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -114,7 +114,7 @@ } devices_needing_firmware() { - local _d _m _line _dmesgtail _last='' + local _d _m _line _dmesgtail _last='' _nl=$( echo ) # When we're not in the installer, the dmesg.boot can # contain multiple boots, so only look in the last one @@ -124,11 +124,8 @@ grep -v '^[[:space:]]*#' "$FWPATTERNS" | while read -r _d _m; do [ "$_d" = "$_last" ] && continue - [ "$_m" ] || _m="^${_d}[0-9] at " - - if [ "$_m" != "${_m#^}" ]; then - _m="$( echo -n "\n${_m#^}" )" - fi + [ "$_m" ] || _m="${_nl}${_d}[0-9] at " + [ "$_m" = "${_m#^}" ] || _m="${_nl}${_m#^}" if [[ $_dmesgtail = *$_m* ]]; then echo "$_d"