===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.86
retrieving revision 1.94
diff -u -r1.86 -r1.94
--- openbsd/fw_update/fw_install.sh	2021/12/18 22:08:04	1.86
+++ openbsd/fw_update/fw_install.sh	2021/12/21 02:16:01	1.94
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.86 2021/12/18 22:08:04 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.94 2021/12/21 02:16:01 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -34,6 +34,8 @@
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
 
+DOWNLOAD=true
+INSTALL=true
 LOCALSRC=
 
 tmpdir() {
@@ -53,7 +55,7 @@
 }
 
 fetch() {
-	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit
+	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit _error=''
 
 	# If we're not in the installer,
 	# we have su(1) and doas(1) is unlikely to be configured.
@@ -82,7 +84,7 @@
 				sleep 1
 			else
 				kill -INT -"$_pid"
-				echo "fetch timed out" >&2
+				_error=" (timed out)"
 			fi
 		else
 			sleep 1
@@ -98,7 +100,7 @@
 
 	if [ "$_exit" -ne 0 ]; then
 		rm -f "$_dst"
-		echo "Cannot fetch $_src" >&2
+		echo "Cannot fetch $_src$_error" >&2
 		return 1
 	fi
 }
@@ -112,38 +114,24 @@
 }
 
 devices_needing_firmware() {
-	local _d _m _line _dmesgtail _last=''
+	local _d _m _line _dmesgtail _last='' _nl=$( echo )
 
 	# When we're not in the installer, the dmesg.boot can
 	# contain multiple boots, so only look in the last one
-	sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot |
-	    grep -e "^[a-z][a-z]*[0-9]" -e " not configured " | { \
-		_m=0
-		set -A _dmesgtail
-		while read -r _line; do
-			_dmesgtail[$_m]="$_line"
-			_m=$(( _m + 1 ))
-		done
+	_dmesgtail="$( echo ; sed -n 'H;/^OpenBSD/h;${g;p;}' /var/run/dmesg.boot |
+	    grep -e "^[a-z][a-z]*[0-9]" -e " not configured " )"
 
-		grep -v '^[[:space:]]*#' "$FWPATTERNS" |
-		    while read -r _d _m; do
-			[ "$_d" = "$_last" ] && continue
-			[ "$_m" ] || _m="^${_d}[0-9] at "
+	grep -v '^[[:space:]]*#' "$FWPATTERNS" |
+	    while read -r _d _m; do
+		[ "$_d" = "$_last" ] && continue
+		[ "$_m" ]             || _m="${_nl}${_d}[0-9] at "
+		[ "$_m" = "${_m#^}" ] || _m="${_nl}${_m#^}"
 
-			if [ "$_m" = "${_m#^}" ]; then
-				_m="*$_m"
-			else
-				_m="${_m#^}"
-			fi
-
-			for _line in "${_dmesgtail[@]}"; do
-				if [[ $_line = ${_m}* ]]; then
-					echo "$_d"
-					_last="$_d"
-				fi
-			done
-		    done
-	}
+		if [[ $_dmesgtail = *$_m* ]]; then
+			echo "$_d"
+			_last="$_d"
+		fi
+	    done
 }
 
 firmware_filename() {
@@ -219,40 +207,52 @@
 }
 
 usage() {
-	echo "usage: fw_install [-DL] [driver | file [...]]"
+	echo "usage:  ${0##*/} [-D | -L] [driver | file ...]"
 	exit 2
 }
 
-INSTALL=true
-DOWNLOAD=true
-
+OPT_D=
+OPT_L=
 while getopts DL name
 do
        case "$name" in
-       # "download only" means local dir and don't install
-       D) LOCALSRC=. INSTALL=false ;;
-       L) LOCALSRC=. ;;
+       D) OPT_D=true ;;
+       L) OPT_L=true ;;
        ?) usage 2 ;;
        esac
 done
 shift $((OPTIND - 1))
 
-# If we're installing from a local dir
-# we don't want to download anything
-[ "$LOCALSRC" ] && "$INSTALL" && DOWNLOAD=false
-[ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )"
+[ "$OPT_D" ] && [ "$OPT_L" ] && usage 1
 
+if [ "$OPT_D" ]; then
+	# "Download only" means local dir and don't install
+	INSTALL=false
+	LOCALSRC=.
+elif [ "$OPT_L" ]; then
+	# "Local" means don't download, install from local dir
+	DOWNLOAD=false
+	LOCALSRC=.
+else
+	LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )"
+fi
+
 CFILE="$LOCALSRC/$CFILE"
 
+if "$INSTALL" && [ -x /usr/bin/id ] && [ $(/usr/bin/id -u) != 0 ]; then
+	echo "need root privileges" >&2
+	exit 1
+fi
+
 set -A devices -- "$@"
 
-[ "${devices[*]:-}" ] ||
-    set -A devices -- $( devices_needing_firmware )
-
 if [ ! "${devices[*]:-}" ]; then
-	echo "No devices found which need firmware files to be downloaded."
-	exit
+	echo -n "Detecting firmware ..."
+	set -A devices -- $( devices_needing_firmware )
+	[ "${devices[*]:-}" ] && echo " found." || echo " done."
 fi
+
+[ "${devices[*]:-}" ] || exit
 
 if "$DOWNLOAD"; then
 	fetch "$CFILE"