=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.132 retrieving revision 1.134 diff -u -r1.132 -r1.134 --- openbsd/fw_update/fw_install.sh 2021/12/25 19:08:52 1.132 +++ openbsd/fw_update/fw_install.sh 2021/12/25 19:16:57 1.134 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.132 2021/12/25 19:08:52 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.134 2021/12/25 19:16:57 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -132,7 +132,7 @@ # When we're not in the installer, the dmesg.boot can # contain multiple boots, so only look in the last one - _dmesgtail="$( echo ; sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot ) + _dmesgtail="$( echo ; sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot )" grep -v '^[[:space:]]*#' "$FWPATTERNS" | while read -r _d _m; do @@ -427,12 +427,8 @@ if [ -e "$f" ]; then if "$DOWNLOAD"; then - if "$VERBOSE"; then - "$INSTALL" && - echo "Verify ${f##*/}" || - echo "Keep/Verify ${f##*/}" - echo "Verify ${f##*/}" - fi + "$VERBOSE" && ! "$INSTALL" && + echo "Keep/Verify ${f##*/}" "$DRYRUN" || verify "$f" || continue "$INSTALL" || kept="$kept,$d" # else assume it was verified when downloaded