=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.31 retrieving revision 1.33 diff -u -r1.31 -r1.33 --- openbsd/fw_update/fw_install.sh 2021/11/18 02:18:32 1.31 +++ openbsd/fw_update/fw_install.sh 2021/11/19 03:13:11 1.33 @@ -63,16 +63,9 @@ do_as _file "$@" } -# "fail" needs to be replaced with the "ask_yn" loop like in the installer. -_issue= -fail() { - echo $_issue >&2 - exit 1 -} - -VNAME=$(sysctl -n kern.osrelease) -VERSION="${VNAME%.*}${VNAME#*.}" -FWDIR="$VNAME" +VNAME=${VNAME:-$(sysctl -n kern.osrelease)} +VERSION=${VERSION:"${VNAME%.*}${VNAME#*.}"} +FWDIR=${FWDIR:-$VNAME} MODE=${MODE:-install} # TODO: We need the firmware for the system we just installed