=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.89 retrieving revision 1.92 diff -u -r1.89 -r1.92 --- openbsd/update_openbsd/update_openbsd 2017/11/28 02:56:20 1.89 +++ openbsd/update_openbsd/update_openbsd 2017/11/28 03:29:59 1.92 @@ -1,5 +1,5 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.88 2017/11/28 02:54:34 andrew Exp $ +# $AFresh1: update_openbsd,v 1.91 2017/11/28 03:28:26 andrew Exp $ # # Copyright (c) 2012 Andrew Fresh # @@ -514,9 +514,8 @@ . ${HOME}/.update_openbsdrc fi -#MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD} +MIRROR=${MIRROR:=http://fastly.cdn.openbsd.org/pub/OpenBSD} FTP_CMD=${FTP_CMD:=ftp -V} -PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/} DESTDIR=${DESTDIR:=/} SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge} @@ -525,6 +524,9 @@ export PKG_PATH TRUSTED_PKG_PATH set_version + +PKG_PATH=${PKG_PATH:=${MIRROR}/${FORCE_DIR:=$NEW_VER}/packages/`machine`/} +TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine`/all/} INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}