===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.119
retrieving revision 1.122
diff -u -r1.119 -r1.122
--- openbsd/fw_update/fw_install.sh	2021/12/24 01:20:52	1.119
+++ openbsd/fw_update/fw_install.sh	2021/12/24 02:36:13	1.122
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.119 2021/12/24 01:20:52 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.122 2021/12/24 02:36:13 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -241,40 +241,52 @@
 }
 
 usage() {
-	echo "usage:  ${0##*/} [-d | -D | -L] [-av] [driver | file ...]"
+	echo "usage:  ${0##*/} [-d | -D] [-av] [-p path] [driver | file ...]"
 	exit 2
 }
 
 ALL=false
 OPT_D=
-OPT_L=
-while getopts :adDLv name
+while getopts :adDp:v name
 do
        case "$name" in
        a) ALL=true ;;
        d) DELETE=true ;;
        D) OPT_D=true ;;
-       L) OPT_L=true ;;
+       p) LOCALSRC="$OPTARG" ;;
        v) VERBOSE=true ;;
-       ?) echo "${0##*/}: unknown option -- -$OPTARG"; usage 2 ;;
+       :)
+	   echo "${0##*/}: option requires an argument -- -$OPTARG" >&2
+	   usage 2
+	   ;;
+       ?)
+	   echo "${0##*/}: unknown option -- -$OPTARG" >&2
+	   usage 2
+	   ;;
        esac
 done
 shift $((OPTIND - 1))
 
-[ "$OPT_D" ] && [ "$OPT_L" ] && usage 1
+if [ "$LOCALSRC" ]; then
+	if [[ $LOCALSRC = @(ftp|http?(s))://* ]]; then
+		FWURL="${LOCALSRC}"
+		LOCALSRC=
+	else
+		LOCALSRC="${LOCALSRC:#file:}"
+		! [ -d "$LOCALSRC" ] &&
+		    echo "The path must be a URL or an existing directory" >&2 &&
+		    exit 2
+	fi
+fi
 
+# "Download only" means local dir and don't install
 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/${0##*/}" )"
+	LOCALSRC="${LOCALSRC:-.}"
 fi
 
+[ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
+
 CFILE="$LOCALSRC/$CFILE"
 
 if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
@@ -285,7 +297,7 @@
 set -A devices -- "$@"
 
 if "$DELETE"; then
-	[ "$OPT_D" ] || [ "$OPT_L" ] && usage 22
+	[ "$OPT_D" ] && usage 22
 
 	set -A installed
 	if [ "${devices[*]:-}" ]; then
@@ -341,6 +353,10 @@
 	set -o noclobber
 	! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
 	    echo "Signature check of SHA256.sig failed" >&2 && exit 1
+elif [ ! -e "$CFILE" ]; then
+	# TODO: We shouldn't need a CFILE if all arguments are files.
+	echo "${0##*/}: $CFILE: No such file or directory" >&2
+	exit 2
 fi
 
 added=''