===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.66
retrieving revision 1.74
diff -u -r1.66 -r1.74
--- openbsd/fw_update/fw_install.sh	2021/12/11 03:12:21	1.66
+++ openbsd/fw_update/fw_install.sh	2021/12/11 20:57:51	1.74
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.66 2021/12/11 03:12:21 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.74 2021/12/11 20:57:51 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -32,6 +32,8 @@
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
 
+LOCALSRC=
+
 tmpdir() {
 	local _i=1 _dir
 
@@ -48,44 +50,32 @@
 	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
+	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _exit
 
 	# If we're not in the installer, we have su(1)
 	# and doas(1) is unlikely to be configured.
 	if [ -x /usr/bin/su ]; then
 		/usr/bin/su -s /bin/ksh "$_user" -c \
-		    "/usr/bin/ftp -D 'Get/Verify' -Vm \
-		        -o- '${FWURL}/${_file}'" > "$_file"
+		    "/usr/bin/ftp -D 'Get/Verify' -Vm -o- '$_src'" > "$_dst"
 		_exit="$?"
 	else
 		/usr/bin/doas -u "$_user" \
-		    ftp -D 'Get/Verify' -Vm \
-		        -o- "${FWURL}/${_file}" > "$_file"
+		    /usr/bin/ftp -D 'Get/Verify' -Vm -o- "$_src" > "$_dst"
 		_exit="$?"
 	fi
 
 	if [ "$_exit" -ne 0 ]; then
-		rm -f "$_file"
-		echo "Cannot fetch $_file" >&2
+		rm -f "$_dst"
+		echo "Cannot fetch $_src" >&2
 		return 1
 	fi
 }
 
 verify() {
 	# On the installer we don't get sha256 -C, so fake it.
-	if ! fgrep -qx "SHA256 ($1) = $( /bin/sha256 -qb "$1" )" "$CFILE"; then
-		echo "Checksum test for $1 failed." >&2
+	if ! fgrep -qx "SHA256 (${1##*/}) = $( /bin/sha256 -qb "$1" )" "$CFILE"; then
+		echo "Checksum test for ${1##*/} failed." >&2
 		return 1
 	fi
 }
@@ -131,14 +121,15 @@
 }
 
 add_firmware () {
-	local _f="${1##*/}" _pkgdir="${DESTDIR}/var/db/pkg"
+	local _f="${1##*/}"
+	local _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}"
 	ftp -D "Install" -Vmo- "file:${1}" |
-		tar -s ",^\+,${_pkgdir}/${_f%.tgz}/+," \
-		-s ",^firmware,${DESTDIR}/etc/firmware," \
-		-C / -zxphf - "+*" "firmware/*"
+		tar -s ",^\+,${_pkgdir}/+," \
+		    -s ",^firmware,${DESTDIR}/etc/firmware," \
+		    -C / -zxphf - "+*" "firmware/*"
 
 	# TODO: Should we mark these so real fw_update can -Drepair?
-	ed -s "${_pkgdir}/${_f%.tgz}/+CONTENTS" <<EOL
+	ed -s "${_pkgdir}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation
 @option firmware
@@ -186,22 +177,24 @@
 	exit 2
 }
 
-DOWNLOADDIR=
-LOCALDIR=
-while getopts d:L: name
+INSTALL=true
+DOWNLOAD=true
+
+while getopts dL name
 do
        case "$name" in
-       d) DOWNLOADDIR=$OPTARG ;;
-       L) LOCALDIR=$OPTARG    ;;
+       # "download only" means local dir and don't install
+       d) LOCALSRC=. INSTALL=false ;;
+       L) LOCALSRC=. ;;
        ?) usage 2 ;;
        esac
 done
 shift $((OPTIND - 1))
 
-if [[ -n "$DOWNLOADDIR" && -n "$LOCALDIR" ]]; then
-	echo "Cannot use -d and -L" >&2
-	usage 2
-fi
+# 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" )"
 
 set -A devices -- "$@"
 
@@ -213,56 +206,27 @@
 	exit
 fi
 
-# Have to find the full path to firmware files
-# so we can cd and still find them later.
-i=0
-while (( i < "${#devices[@]}" )); do
-	f="${devices[$i]}"
-	d=$( firmware_devicename "$f" )
-	[ "$f" = "$d" ] && f="$( echo "$f"-firmware-*.tgz | sed '$!d' )"
-	if [ -e "$f" ]; then
-		if [ "$DOWNLOADDIR" ]; then
-			echo "Cannot download local file $f" >&2
-			exit 2
-		fi
-		devices[$i]="$d:$( realpath "$f" )"
-	fi
-	i=$((i + 1))
-done
-
-if [ "$DOWNLOADDIR" ]; then
-	if ! cd "$DOWNLOADDIR"; then
-		echo "Unable to use $DOWNLOADDIR, make sure it is a directory"
-		exit 2
-	fi
-elif [ "$LOCALDIR" ]; then
-	if ! cd "$LOCALDIR"; then
-		echo "Unable to use $LOCALDIR, make sure it is a directory"
-		exit 2
-	fi
-else
-	TMPDIR=$( tmpdir "${DESTDIR}/tmp/fw_install" )
-	cd "$TMPDIR"
-fi
-
-if ! [[ -n "$LOCALDIR" && -e "$CFILE" ]]; then
+if "$DOWNLOAD"; then
 	fetch "$CFILE"
 	! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
 	    echo "Signature check of SHA256.sig failed" >&2 && exit 1
 fi
 
-for d in "${devices[@]}"; do
-	f="${d##*:}"
+for f in "${devices[@]}"; do
+	d="$( firmware_devicename "$f" )"
+
 	if [ "$f" = "$d" ]; then
 		f=$( firmware_filename "$d" || true )
 		[ "$f" ] || continue
-	else
-		d="${d%:*}"
+		f="$LOCALSRC/$f"
+	elif ! "$INSTALL" && ! grep -q "($f)" "$CFILE" ; then
+		echo "Cannot download local file $f" >&2
+		exit 2
 	fi
 
 	set -A installed -- $( installed_firmware "$d" )
 
-	if [ ! "$DOWNLOADDIR" ] && [ "${installed[*]:-}" ]; then
+	if "$INSTALL" && [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do
 			if [ "${f##*/}" = "$i.tgz" ]; then
 				echo "$i already installed"
@@ -271,16 +235,21 @@
 		done
 	fi
 
-	if [ ! -e "$f" ]; then
-		[ "$LOCALDIR" ] && echo "Cannot install $f, not found" >&2 && continue
+	if [ -e "$f" ]; then
+		if "$DOWNLOAD"; then
+			echo "Verify existing ${f##*/}"
+			verify "$f" || continue
+		# else assume it was verified when downloaded
+		fi
+	elif "$INSTALL" && ! "$DOWNLOAD"; then
+		echo "Cannot install ${f##*/}, not found" >&2
+		continue
+	else
 		fetch  "$f" || continue
 		verify "$f" || continue
-	elif [ "$DOWNLOADDIR" ]; then
-		echo "Already have $f"
-		verify "$f" || continue
 	fi
 
-	[ "$DOWNLOADDIR" ] && continue
+	"$INSTALL" || continue
 
 	if [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do