=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.113 retrieving revision 1.115 diff -u -r1.113 -r1.115 --- openbsd/fw_update/fw_install.sh 2021/12/23 21:34:12 1.113 +++ openbsd/fw_update/fw_install.sh 2021/12/23 21:43:04 1.115 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.113 2021/12/23 21:34:12 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.115 2021/12/23 21:43:04 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -345,6 +345,7 @@ added='' updated='' +kept='' for f in "${devices[@]}"; do d="$( firmware_devicename "$f" )" @@ -363,6 +364,7 @@ for i in "${installed[@]}"; do if [ "${f##*/}" = "$i.tgz" ]; then "$VERBOSE" && echo "$i already installed" + kept="$kept,$d" continue 2 fi done @@ -395,18 +397,13 @@ add_firmware "$f" if "$removed"; then - [ "$updated" ] && updated="$updated," - updated="$updated$d" + updated="$updated,$d" else - [ "$added" ] && added="$added," - added="$added$d" + added="$added,$d" fi done -if ! $VERBOSE && { [ "$added" ] || [ "$updated" ]; }; then - echo "${0##*/}: $( - [ "$added" ] && echo -n "added ${added}" - [ "$added" ] && [ "$updated" ] && echo -n "; " - [ "$updated" ] && echo -n "updated ${updated}" - )" -fi +added="${added:#,}" +updated="${updated:#,}" +kept="${kept:#,}" +echo "${0##*/}: added ${added:-none}; updated ${updated:-none}; kept ${kept:-none}"