=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.113 retrieving revision 1.116 diff -u -r1.113 -r1.116 --- openbsd/fw_update/fw_install.sh 2021/12/23 21:34:12 1.113 +++ openbsd/fw_update/fw_install.sh 2021/12/23 21:46:46 1.116 @@ -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.116 2021/12/23 21:46:46 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -338,13 +338,16 @@ [ "${devices[*]:-}" ] || exit if "$DOWNLOAD"; then + set +o noclobber # we want to get the latest CFILE fetch "$CFILE" + set -o noclobber ! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" && echo "Signature check of SHA256.sig failed" >&2 && exit 1 fi added='' updated='' +kept='' for f in "${devices[@]}"; do d="$( firmware_devicename "$f" )" @@ -363,6 +366,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 +399,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}"