===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.113
retrieving revision 1.118
diff -u -r1.113 -r1.118
--- openbsd/fw_update/fw_install.sh	2021/12/23 21:34:12	1.113
+++ openbsd/fw_update/fw_install.sh	2021/12/24 00:46:02	1.118
@@ -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.118 2021/12/24 00:46:02 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -277,11 +277,9 @@
 
 CFILE="$LOCALSRC/$CFILE"
 
-if "$INSTALL" || "$DELETE"; then
-	if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
-		echo "need root privileges" >&2
-		exit 1
-	fi
+if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
+	echo "need root privileges" >&2
+	exit 1
 fi
 
 set -A devices -- "$@"
@@ -338,13 +336,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 +364,7 @@
 		for i in "${installed[@]}"; do
 			if [ "${f##*/}" = "$i.tgz" ]; then
 				"$VERBOSE" && echo "$i already installed"
+				kept="$kept,$d"
 				continue 2
 			fi
 		done
@@ -372,11 +374,13 @@
 		if "$DOWNLOAD"; then
 			"$VERBOSE" && echo "Verify existing ${f##*/}"
 			verify "$f" || continue
+			"$INSTALL"  || kept="$kept,$d"
 		# else assume it was verified when downloaded
 		fi
 	elif "$DOWNLOAD"; then
 		fetch  "$f" || continue
 		verify "$f" || continue
+		"$INSTALL"  || added="$added,$d"
 	elif "$INSTALL"; then
 		echo "Cannot install ${f##*/}, not found" >&2
 		continue
@@ -395,18 +399,17 @@
 	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}"
-	)"
+added="${added:#,}"
+updated="${updated:#,}"
+kept="${kept:#,}"
+if "$INSTALL"; then
+	echo  "${0##*/}: added ${added:-none}; updated ${updated:-none}; kept ${kept:-none}"
+else
+	echo  "${0##*/}: downloaded ${added:-none}; kept ${kept:-none}"
 fi