=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.59 retrieving revision 1.62 diff -u -r1.59 -r1.62 --- openbsd/update_openbsd/update_openbsd 2014/01/22 06:44:53 1.59 +++ openbsd/update_openbsd/update_openbsd 2014/01/23 02:40:07 1.62 @@ -1,5 +1,5 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.58 2013/12/31 18:46:59 andrew Exp $ +# $AFresh1: update_openbsd,v 1.61 2014/01/23 02:30:02 andrew Exp $ # # Copyright (c) 2012 Andrew Fresh # @@ -266,7 +266,7 @@ fi local _nv=`echo $NEW_VER | sed -e 's/\.//'` - local _signify=`which signify` + local _signify=`which signify 2>/dev/null` local _keyfile=/etc/signify/${_nv}base.pub local _b _s @@ -337,7 +337,7 @@ for _type in $CHECKSUM_TYPES; do if [ -e $_type ]; then check_sum $_type && break - [ -z "$IGNORE_CHECKSUM_ERROR" ] || exit 1 + [ -z "$IGNORE_CHECKSUM_ERROR" ] && exit 1 fi done @@ -476,10 +476,10 @@ local _v=$FILE_VER local _args="" if [ -e etc${_v}.tgz ]; then - _args="$_args -s etc${_v}.tgz" + _args="$_args -s ${RELEASEDIR}/etc${_v}.tgz" fi if [ -e xetc${_v}.tgz ]; then - _args="$_args -x xetc${_v}.tgz" + _args="$_args -x ${RELEASEDIR}/xetc${_v}.tgz" fi if [ X"" == X"$_args" ]; then echo ERROR: No upgrade sets found! >&2