===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.92
retrieving revision 1.100
diff -u -r1.92 -r1.100
--- openbsd/fw_update/fw_install.sh	2021/12/19 20:22:49	1.92
+++ openbsd/fw_update/fw_install.sh	2021/12/22 04:29:18	1.100
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.92 2021/12/19 20:22:49 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.100 2021/12/22 04:29:18 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
 
@@ -34,6 +34,7 @@
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
 
+VERBOSE=false
 DOWNLOAD=true
 INSTALL=true
 LOCALSRC=
@@ -71,7 +72,7 @@
 	) & _pid=$!
 	set +o monitor
 
-	trap "kill -TERM '-$_pid'; exit 1" EXIT INT QUIT ABRT TERM
+	trap "kill -TERM '-$_pid' 2>/dev/null; exit 1" EXIT INT QUIT ABRT TERM
 
 	SECONDS=0
 	_last=0
@@ -148,10 +149,12 @@
 }
 
 installed_firmware() {
+	set +o noglob
 	for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
-		[ -e "$fw" ] || continue
+		[ -e "$fw/+CONTENTS" ] || continue
 		echo "${fw##*/}"
 	done
+	set -o noglob
 }
 
 add_firmware () {
@@ -199,7 +202,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,18 +212,19 @@
 }
 
 usage() {
-	echo "usage: fw_install [-D | -L] [driver | file ...]"
+	echo "usage:  ${0##*/} [-D | -L] [driver | file ...]"
 	exit 2
 }
 
 OPT_D=
 OPT_L=
-while getopts DL name
+while getopts :DLv name
 do
        case "$name" in
        D) OPT_D=true ;;
        L) OPT_L=true ;;
-       ?) usage 2 ;;
+       v) VERBOSE=true ;;
+       ?) echo "${0##*/}: unknown option -- -$OPTARG"; usage 2 ;;
        esac
 done
 shift $((OPTIND - 1))
@@ -238,6 +244,11 @@
 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 -- "$@"