=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.39 retrieving revision 1.41 diff -u -r1.39 -r1.41 --- openbsd/fw_update/fw_install.sh 2021/12/01 02:19:00 1.39 +++ openbsd/fw_update/fw_install.sh 2021/12/01 02:30:43 1.41 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.39 2021/12/01 02:19:00 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.41 2021/12/01 02:30:43 afresh1 Exp $ set -e # Copyright (c) 2021 Andrew Hewus Fresh @@ -81,7 +81,6 @@ VNAME=${VNAME:-$(sysctl -n kern.osrelease)} VERSION=${VERSION:-"${VNAME%.*}${VNAME#*.}"} FWDIR=${FWDIR:-$VNAME} -MODE=${MODE:-install} # TODO: We need the firmware for the system we just installed # not the one we booted from. For example: @@ -108,7 +107,6 @@ _f _r _remove _i _installed local _srclocal=false _unpriv=unpriv - echo "Let's $MODE firmware!" local _d _drivers=$( last='' while read _d _m; do @@ -167,7 +165,7 @@ echo "Signature check of SHA256.sig failed" >&2 && return 1 for _d in $_drivers; do - _f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" | tail -1 ) + _f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" | sed '$!d' ) _installed=$( for fw in "${_pkgdir}/$_d-firmware"*; do [ -e "$fw" ] || continue