===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.51
retrieving revision 1.56
diff -u -r1.51 -r1.56
--- openbsd/fw_update/fw_install.sh	2021/12/07 02:42:01	1.51
+++ openbsd/fw_update/fw_install.sh	2021/12/08 03:44:37	1.56
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.51 2021/12/07 02:42:01 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.56 2021/12/08 03:44:37 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -25,7 +25,8 @@
 VERSION=${VERSION:-"${VNAME%.*}${VNAME#*.}"}
 
 HTTP_FWDIR="$VNAME"
-VTYPE=$( sed -n "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p" /var/run/dmesg.boot | sed '$!d' )
+VTYPE=$( sed -n "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p" \
+    /var/run/dmesg.boot | sed '$!d' )
 [[ $VTYPE == -!(stable) ]] && HTTP_FWDIR=snapshots
 
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
@@ -47,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
 
@@ -55,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}'"
@@ -105,7 +116,10 @@
 }
 
 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"
 }
 
 installed_firmware() {
@@ -148,7 +162,7 @@
 		  ;;
 		@*) continue
 		  ;;
-		*)  set -A _remove -- "$_cwd/$c" "${_remove[@]}"
+		*) set -A _remove -- "$_cwd/$c" "${_remove[@]}"
 		  ;;
 		esac
 	done < "${_pkgdir}/${_pkg}/+CONTENTS"
@@ -180,11 +194,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" )