===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- openbsd/fw_update/fw_install.sh	2021/12/23 20:38:12	1.112
+++ openbsd/fw_update/fw_install.sh	2021/12/23 21:34:12	1.113
@@ -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.113 2021/12/23 21:34:12 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 ;;
@@ -287,25 +289,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 +326,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" &&