=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.76 retrieving revision 1.80 diff -u -r1.76 -r1.80 --- openbsd/fw_update/fw_install.sh 2021/12/11 21:11:02 1.76 +++ openbsd/fw_update/fw_install.sh 2021/12/12 20:21:14 1.80 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.76 2021/12/11 21:11:02 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.80 2021/12/12 20:21:14 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -16,6 +16,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. set -o errexit -o pipefail -o nounset +export PATH=/usr/bin:/bin:/usr/sbin:/sbin CFILE=SHA256.sig DESTDIR=${DESTDIR:-} @@ -38,7 +39,7 @@ local _i=1 _dir # If we're not in the installer, - # we have mktemp and a more hostile environment + # we have mktemp and a more hostile environment. if [ -x /usr/bin/mktemp ]; then _dir=$( mktemp -d "${1}-XXXXXXXXX" ) else @@ -53,8 +54,8 @@ fetch() { 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 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- '$_src'" > "$_dst" @@ -173,7 +174,7 @@ } usage() { - echo "usage: fw_install [-d dir | -L dir] [driver | file [...]]" + echo "usage: fw_install [-dL] [driver | file [...]]" exit 2 } @@ -195,6 +196,8 @@ # we don't want to download anything [ "$LOCALSRC" ] && "$INSTALL" && DOWNLOAD=false [ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )" + +CFILE="$LOCALSRC/$CFILE" set -A devices -- "$@"