===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.90
retrieving revision 1.95
diff -u -r1.90 -r1.95
--- openbsd/fw_update/fw_install.sh	2021/12/19 19:16:55	1.90
+++ openbsd/fw_update/fw_install.sh	2021/12/21 02:16:47	1.95
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.90 2021/12/19 19:16:55 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.95 2021/12/21 02:16:47 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -15,7 +15,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-set -o errexit -o pipefail -o nounset
+set -o errexit -o pipefail -o nounset -o noclobber -o noglob
 set +o monitor
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
@@ -55,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.
@@ -84,7 +84,7 @@
 				sleep 1
 			else
 				kill -INT -"$_pid"
-				echo "fetch timed out" >&2
+				_error=" (timed out)"
 			fi
 		else
 			sleep 1
@@ -100,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
 }
@@ -148,10 +148,12 @@
 }
 
 installed_firmware() {
+	set +o noglob
 	for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
 		[ -e "$fw" ] || continue
 		echo "${fw##*/}"
 	done
+	set -o noglob
 }
 
 add_firmware () {
@@ -199,7 +201,9 @@
 		if [ -d "$_r" ]; then
 			# Try hard not to actually remove recursively
 			# without rmdir on the install media.
+			set +o noglob
 			[ "$_r/*" = "$( echo "$_r"/* )" ] && rm -rf "$_r"
+			set -o noglob
 		else
 			rm -f "$_r"
 		fi
@@ -207,7 +211,7 @@
 }
 
 usage() {
-	echo "usage: fw_install [-D | -L] [driver | file ...]"
+	echo "usage:  ${0##*/} [-D | -L] [driver | file ...]"
 	exit 2
 }
 
@@ -239,15 +243,20 @@
 
 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"