=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.87 retrieving revision 1.89 diff -u -r1.87 -r1.89 --- openbsd/update_openbsd/update_openbsd 2017/11/28 02:52:31 1.87 +++ openbsd/update_openbsd/update_openbsd 2017/11/28 02:56:20 1.89 @@ -1,5 +1,5 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.86 2017/03/01 03:22:51 andrew Exp $ +# $AFresh1: update_openbsd,v 1.88 2017/11/28 02:54:34 andrew Exp $ # # Copyright (c) 2012 Andrew Fresh # @@ -118,10 +118,13 @@ fi if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then - if [ X"No" == X"${FORCE_DIR}" ]; then - _dir=${NEW_VER} - else + if [ X"No" != X"${FORCE_DIR}" ]; then _dir=${FORCE_DIR} + elif sysctl kern.version | grep -q -- '-current '; then + _dir=snapshots + FORCE_DIR=snapshots + else + _dir=${NEW_VER} fi FTP=${MIRROR}/${_dir}/`machine` @@ -534,7 +537,7 @@ echo "------------------------------------------------------" echo echo " SYSMERGE: $SYSMERGE" -echo " MIRROR: $MIRROR" +echo " MIRROR: $FTP" echo " PKG_PATH: $PKG_PATH" echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH" echo " RELEASEDIR: $RELEASEDIR"