===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.52
retrieving revision 1.57
diff -u -r1.52 -r1.57
--- openbsd/fw_update/fw_install.sh	2021/12/07 03:09:17	1.52
+++ openbsd/fw_update/fw_install.sh	2021/12/08 03:45:05	1.57
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.52 2021/12/07 03:09:17 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.57 2021/12/08 03:45:05 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -48,6 +48,16 @@
 	echo "$_dir"
 }
 
+realpath () {
+	if [ -x /usr/bin/realpath ]; then
+		/usr/bin/realpath "$1"
+	elif [ "$1" = "${1%/*}" ]; then
+		echo "${PWD}/$1"
+	else
+		echo "$( cd "${1%/*}" && pwd )/${1##*/}"
+	fi
+}
+
 fetch() {
 	local _file=$1 _user=_file _exit
 
@@ -56,7 +66,7 @@
 
 	# If we're not in the installer, we have su(1)
 	# and doas(1) is unlikely to be configured.
-	if [ -x /usr/bin/sh ]; then
+	if [ -x /usr/bin/su ]; then
 		/usr/bin/su -s /bin/ksh "$_user" -c \
 		    "/usr/bin/ftp -D 'Get/Verify' -Vm \
 		        -o '$_file' '${FWURL}/${_file}'"
@@ -106,9 +116,18 @@
 }
 
 firmware_filename() {
-	sed -n "s/.*(\($1-firmware-.*\.tgz\)).*/\1/p" "$CFILE" | sed '$!d'
+	local _f
+	_f="$( sed -n "s/.*(\($1-firmware-.*\.tgz\)).*/\1/p" "$CFILE" | sed '$!d' )"
+	! [ "$_f" ] && echo "Unable to find firmware for $1" >&2 && return 1
+	echo "$_f"
 }
 
+firmware_devicename() {
+	local _d="${1##*/}"
+	_d="${_d%-firmware-*}"
+	echo "$_d"
+}
+
 installed_firmware() {
 	for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
 		[ -e "$fw" ] || continue
@@ -181,11 +200,11 @@
 chmod go+x .
 
 fetch "$CFILE"
-! signify -Vep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
+! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
     echo "Signature check of SHA256.sig failed" >&2 && exit 1
 
 for d in "${devices[@]}"; do
-	f=$( firmware_filename "$d" )
+	f=$( firmware_filename "$d" || true )
 	[ "$f" ] || continue
 	set -A installed -- $( installed_firmware "$d" )