=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.54 retrieving revision 1.57 diff -u -r1.54 -r1.57 --- openbsd/update_openbsd/update_openbsd 2013/12/28 02:55:28 1.54 +++ openbsd/update_openbsd/update_openbsd 2013/12/31 18:42:31 1.57 @@ -1,5 +1,5 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.53 2013/11/09 21:58:26 andrew Exp $ +# $AFresh1: update_openbsd,v 1.56 2013/12/28 02:58:37 andrew Exp $ # # Copyright (c) 2012 Andrew Fresh # @@ -234,10 +234,12 @@ done local _type + local _ftp for _type in $CHECKSUM_TYPES; do [ -e $_type ] && break - echo "===> $FTP_CMD ${FTP}/$_type" - $FTP_CMD ${FTP}/$_type + _ftp=`echo "$FTP" | sed -e 's,://[^/]*/,://ftp.openbsd.org/,'` + echo "===> $FTP_CMD ${_ftp}/$_type" + $FTP_CMD ${_ftp}/$_type done } @@ -263,7 +265,12 @@ return 1 fi - ls bsd* *gz | sed -e 's/\(.*\)/(\1)/' > index + local _nv=`echo $NEW_VER | sed -e 's/\.//'` + + ( + for k in $INSTALL_KERNELS; do echo "($k)" ; done + for f in $INSTALLED_SETS; do echo "($f$_nv.tgz)"; done + ) > index grep -f index $_type | sum -c if [ $? -ne 0 ]; then @@ -316,6 +323,7 @@ for _type in $CHECKSUM_TYPES; do if [ -e $_type ]; then check_sum $_type + [ $? -ne 0 -a -z "$IGNORE_CHECKSUM_ERROR" ] && exit 1 fi done }