=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.51 retrieving revision 1.53 diff -u -r1.51 -r1.53 --- openbsd/fw_update/fw_install.sh 2021/12/07 02:42:01 1.51 +++ openbsd/fw_update/fw_install.sh 2021/12/07 04:23:00 1.53 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.51 2021/12/07 02:42:01 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.53 2021/12/07 04:23:00 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -25,7 +25,8 @@ VERSION=${VERSION:-"${VNAME%.*}${VNAME#*.}"} HTTP_FWDIR="$VNAME" -VTYPE=$( sed -n "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p" /var/run/dmesg.boot | sed '$!d' ) +VTYPE=$( sed -n "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p" \ + /var/run/dmesg.boot | sed '$!d' ) [[ $VTYPE == -!(stable) ]] && HTTP_FWDIR=snapshots FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR} @@ -55,7 +56,7 @@ # If we're not in the installer, we have su(1) # and doas(1) is unlikely to be configured. - if [ -x /usr/bin/sh ]; then + if [ -x /usr/bin/su ]; then /usr/bin/su -s /bin/ksh "$_user" -c \ "/usr/bin/ftp -D 'Get/Verify' -Vm \ -o '$_file' '${FWURL}/${_file}'" @@ -148,7 +149,7 @@ ;; @*) continue ;; - *) set -A _remove -- "$_cwd/$c" "${_remove[@]}" + *) set -A _remove -- "$_cwd/$c" "${_remove[@]}" ;; esac done < "${_pkgdir}/${_pkg}/+CONTENTS"