=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.118 retrieving revision 1.119 diff -u -r1.118 -r1.119 --- openbsd/fw_update/fw_install.sh 2021/12/24 00:46:02 1.118 +++ openbsd/fw_update/fw_install.sh 2021/12/24 01:20:52 1.119 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.118 2021/12/24 00:46:02 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.119 2021/12/24 01:20:52 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -67,10 +67,10 @@ "$VERBOSE" && flags=-vm if [ -x /usr/bin/su ]; then exec /usr/bin/su -s /bin/ksh "$_user" -c \ - "/usr/bin/ftp -D 'Get/Verify' $flags -o- '$_src'" > "$_dst" + "/usr/bin/ftp -N '${0##/}' -D 'Get/Verify' $flags -o- '$_src'" > "$_dst" else exec /usr/bin/doas -u "$_user" \ - /usr/bin/ftp -D 'Get/Verify' $flags -o- "$_src" > "$_dst" + /usr/bin/ftp -N "${0##/}" -D 'Get/Verify' $flags -o- "$_src" > "$_dst" fi ) & _pid=$! set +o monitor @@ -173,7 +173,7 @@ local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )" local flags=-VM "$VERBOSE" && flags=-vm - ftp -D "Install" "$flags" -o- "file:${1}" | + ftp -N "${0##/}" -D "Install" "$flags" -o- "file:${1}" | tar -s ",^\+,${_tmpdir}/+," \ -s ",^firmware,${DESTDIR}/etc/firmware," \ -C / -zxphf - "+*" "firmware/*"