=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.102 retrieving revision 1.105 diff -u -r1.102 -r1.105 --- openbsd/fw_update/fw_install.sh 2021/12/22 04:43:41 1.102 +++ openbsd/fw_update/fw_install.sh 2021/12/22 17:53:53 1.105 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.102 2021/12/22 04:43:41 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.105 2021/12/22 17:53:53 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -216,7 +216,7 @@ } usage() { - echo "usage: ${0##*/} [-D | -L] [driver | file ...]" + echo "usage: ${0##*/} [-v] [-D | -L] [driver | file ...]" exit 2 } @@ -249,7 +249,7 @@ CFILE="$LOCALSRC/$CFILE" -if "$INSTALL" && [ -x /usr/bin/id ] && [ $(/usr/bin/id -u) != 0 ]; then +if "$INSTALL" && [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then echo "need root privileges" >&2 exit 1 fi @@ -271,6 +271,8 @@ echo "Signature check of SHA256.sig failed" >&2 && exit 1 fi +added='' +updated='' for f in "${devices[@]}"; do d="$( firmware_devicename "$f" )" @@ -310,12 +312,29 @@ "$INSTALL" || continue + removed=false if [ "${installed[*]:-}" ]; then for i in "${installed[@]}"; do delete_firmware "$i" + removed=true done fi add_firmware "$f" + + if "$removed"; then + [ "$updated" ] && updated="$updated," + updated="$updated$d" + else + [ "$added" ] && added="$added," + 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