=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.90 retrieving revision 1.92 diff -u -r1.90 -r1.92 --- openbsd/fw_update/fw_install.sh 2021/12/19 19:16:55 1.90 +++ openbsd/fw_update/fw_install.sh 2021/12/19 20:22:49 1.92 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.90 2021/12/19 19:16:55 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.92 2021/12/19 20:22:49 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -55,7 +55,7 @@ } fetch() { - local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit + local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit _error='' # If we're not in the installer, # we have su(1) and doas(1) is unlikely to be configured. @@ -84,7 +84,7 @@ sleep 1 else kill -INT -"$_pid" - echo "fetch timed out" >&2 + _error=" (timed out)" fi else sleep 1 @@ -100,7 +100,7 @@ if [ "$_exit" -ne 0 ]; then rm -f "$_dst" - echo "Cannot fetch $_src" >&2 + echo "Cannot fetch $_src$_error" >&2 return 1 fi } @@ -241,13 +241,13 @@ set -A devices -- "$@" -[ "${devices[*]:-}" ] || - set -A devices -- $( devices_needing_firmware ) - if [ ! "${devices[*]:-}" ]; then - echo "No devices found which need firmware files to be downloaded." - exit + echo -n "Detecting firmware ..." + set -A devices -- $( devices_needing_firmware ) + [ "${devices[*]:-}" ] && echo " found." || echo " done." fi + +[ "${devices[*]:-}" ] || exit if "$DOWNLOAD"; then fetch "$CFILE"