===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.112
retrieving revision 1.118
diff -u -r1.112 -r1.118
--- openbsd/fw_update/fw_install.sh	2021/12/23 20:38:12	1.112
+++ 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.112 2021/12/23 20:38: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>
 #
@@ -241,15 +241,17 @@
 }
 
 usage() {
-	echo "usage:  ${0##*/} [-d | -D | -L] [-v] [driver | file ...]"
+	echo "usage:  ${0##*/} [-d | -D | -L] [-av] [driver | file ...]"
 	exit 2
 }
 
+ALL=false
 OPT_D=
 OPT_L=
-while getopts :dDLv name
+while getopts :adDLv name
 do
        case "$name" in
+       a) ALL=true ;;
        d) DELETE=true ;;
        D) OPT_D=true ;;
        L) OPT_L=true ;;
@@ -275,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 -- "$@"
@@ -287,25 +287,36 @@
 if "$DELETE"; then
 	[ "$OPT_D" ] || [ "$OPT_L" ] && usage 22
 
-	[ "${devices[*]:-}" ] || usage 22
+	set -A installed
+	if [ "${devices[*]:-}" ]; then
+		"$ALL" && usage 22
 
-	deleted=''
-	for d in "${devices[@]}"; do
-		f="${d##*/}"  # don't just uninstall from anywhere
-		f="${f%.tgz}" # allow specifying the package name
+		set -A installed -- $(
+		    for d in "${devices[@]}"; do
+			f="${d##*/}"  # only care about the name
+			f="${f%.tgz}" # allow specifying the package name
+			[ "$( firmware_devicename "$f" )" = "$f" ] && f="$f-firmware"
 
-		set -A installed -- $( installed_firmware '' "$f" '*' )
+			set -A i -- $( installed_firmware '' "$f-" '*' )
 
-		if [ ! "${installed[*]:-}" ]; then
-			echo "No firmware found for '$d'" >&2
-			continue
-		fi
+			if [ "${i[*]:-}" ]; then
+				echo "${i[@]}"
+			else
+				echo "No firmware found for '$d'" >&2
+			fi
+		    done
+		)
+	elif "$ALL"; then
+		set -A installed -- $( installed_firmware '*' '-firmware-' '*' )
+	fi
 
+	deleted=''
+	if [ "${installed:-}" ]; then
 		for fw in "${installed[@]}"; do
 			delete_firmware "$fw" || continue
 			deleted="$deleted,$( firmware_devicename "$fw" )"
 		done
-	done
+	fi
 
 	deleted="${deleted:+${deleted#,}}"
 	echo "${0:##*/}: deleted ${deleted:-none}";
@@ -313,7 +324,9 @@
 	exit
 fi
 
-if [ ! "${devices[*]:-}" ]; then
+if [ "${devices[*]:-}" ]; then
+	"$ALL" && usage 22
+else
 	"$VERBOSE" && echo -n "Detecting firmware ..."
 	set -A devices -- $( devices_needing_firmware )
 	"$VERBOSE" &&
@@ -323,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" )"
 
@@ -348,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
@@ -357,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
@@ -380,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