=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- openbsd/update_openbsd/update_openbsd 2017/11/28 03:54:31 1.93 +++ openbsd/update_openbsd/update_openbsd 2017/12/10 21:16:05 1.94 @@ -1,6 +1,6 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.92 2017/11/28 03:29:59 andrew Exp $ -# +# $AFresh1: update_openbsd,v 1.93 2017/11/28 03:54:31 andrew Exp $ +# # Copyright (c) 2012 Andrew Fresh # # Permission to use, copy, modify, and distribute this software for any @@ -42,7 +42,7 @@ done sendmail -d0.1 --badoption /dev/null | grep -q SASL - if [ $? == 0 ]; then + if [ $? == 0 ]; then echo -n ' sendmail-smtp_auth' fi } @@ -145,7 +145,7 @@ if [ X"" == X"${_v}" ]; then echo No sets in [${FTP}] >&2 - return 2 + return 2 elif [ X"${_cv}" == X"${_v}" ]; then NEW_VER=$CUR_VER elif [ X"${_nv}" == X"${_v}" ]; then @@ -278,15 +278,15 @@ local _nv=`echo $NEW_VER | sed -e 's/\.//'` local _signify=`which signify 2>/dev/null` - local _keyfile=/etc/signify/openbsd-${_nv}-base.pub + local _keyfile=/etc/signify/openbsd-${_nv}-base.pub local _b _s ( for _b in $INSTALL_KERNELS; do echo "($_b)" ; done for _s in $INSTALLED_SETS; do echo "($_s$_nv.tgz)"; done ) > index - + if [ -n "$_signify" -a "$_type" != "${_type%.sig}" ]; then echo "===> Checking signature"; if [ ! -e $_keyfile ]; then @@ -384,7 +384,7 @@ local _is_boot="" [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel" - + echo "Copying $_b to /$_bd $_is_boot" cp ${_b} /nbsd && mv /nbsd /${_bd} if [ $? -ne 0 ]; then @@ -488,7 +488,7 @@ if [ -e xetc${_v}.tgz ]; then _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz" fi - if [ X"" == X"$_args" ]; then + if [ X"" == X"$_args" ]; then echo ERROR: No upgrade sets found! >&2 exit 1 fi @@ -589,7 +589,7 @@ echo >&2 echo "!!! You are upgrading the OpenBSD kernel. !!!" >&2 echo "!!! You will be given the opportunity to reboot !!!" >&2 - echo "!!! at the end of the proces but it is safer to !!!" >&2 + echo "!!! at the end of the proces but it is safer to !!!" >&2 echo "!!! have a separate root shell open. !!!" >&2 echo "!!! It is needed in order to run /sbin/oreboot. !!!" >&2 echo "!!! doas MAY NOT WORK after sets are extracted. !!!" >&2 @@ -637,7 +637,7 @@ echo "$SYSMERGE -b" >>/etc/rc.sysmerge && echo "==> RUNNING $SYSMERGE -b ON REBOOT" - echo Instructions for updating to the new version available from + echo Instructions for updating to the new version available from if [ X"snapshots" == X"$FORCE_DIR" ]; then echo " http://www.openbsd.org/faq/current.html" else