=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.73 retrieving revision 1.75 diff -u -r1.73 -r1.75 --- openbsd/fw_update/fw_install.sh 2021/12/11 20:56:17 1.73 +++ openbsd/fw_update/fw_install.sh 2021/12/11 21:02:24 1.75 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.73 2021/12/11 20:56:17 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.75 2021/12/11 21:02:24 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -121,7 +121,8 @@ } add_firmware () { - local _f="${1##*/}" _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}" + local _f="${1##*/}" + local _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}" ftp -D "Install" -Vmo- "file:${1}" | tar -s ",^\+,${_pkgdir}/+," \ -s ",^firmware,${DESTDIR}/etc/firmware," \ @@ -240,12 +241,12 @@ verify "$f" || continue # else assume it was verified when downloaded fi - elif "$INSTALL" && ! "$DOWNLOAD"; then - echo "Cannot install ${f##*/}, not found" >&2 - continue - else + elif "$DOWNLOAD"; then fetch "$f" || continue verify "$f" || continue + elif "$INSTALL"; then + echo "Cannot install ${f##*/}, not found" >&2 + continue fi "$INSTALL" || continue