=================================================================== RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v retrieving revision 1.74 retrieving revision 1.76 diff -u -r1.74 -r1.76 --- openbsd/update_openbsd/update_openbsd 2015/03/21 23:50:18 1.74 +++ openbsd/update_openbsd/update_openbsd 2015/05/03 00:27:53 1.76 @@ -1,5 +1,5 @@ #!/bin/sh -# $AFresh1: update_openbsd,v 1.72 2015/01/18 03:41:33 andrew Exp $ +# $AFresh1: update_openbsd,v 1.75 2015/05/02 23:27:01 andrew Exp $ # # Copyright (c) 2012 Andrew Fresh # @@ -27,10 +27,12 @@ local xserv=/usr/X11R6/bin/X local xshare=/usr/X11R6/bin/startx + local _nv=`echo $NEW_VER | sed -e 's/\.//'` local _c _d _e echo -n base - echo -n ' etc' + [ $_nv -lt 57 ] && echo -n ' etc' for _d in misc man comp game xbase xetc xfont xserv xshare; do + [ $_d = xetc -a $_nv -ge 57 ] && continue eval _e=\$${_d} _c=`ls $_e 2> /dev/null | wc -l` #echo $_c $_d $_e @@ -515,6 +517,8 @@ FTP_CMD=${FTP_CMD:=ftp -V} PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/} +set_version + DESTDIR=${DESTDIR:=/} SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge} FORCE_DIR=${FORCE_DIR:=No} @@ -523,7 +527,6 @@ CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256} -set_version local _error=$? echo @@ -610,8 +613,14 @@ fi update_etc - echo '==> UPDATING PACKAGES' - pkg_add -ui -F update -F updatedepends + OPENUP=$( which openup ) + if [ -n "$OPENUP" ]; then + echo "==> UPDATING WITH $OPENUP" + $OPENUP + else + echo '==> UPDATING PACKAGES' + pkg_add -ui -F update -F updatedepends + fi echo '==> UPDATING FIRMWARE' fw_update