=================================================================== RCS file: /cvs/openbsd/update_openbsd/release.sh,v retrieving revision 1.26 retrieving revision 1.29 diff -u -r1.26 -r1.29 --- openbsd/update_openbsd/release.sh 2008/11/03 18:58:23 1.26 +++ openbsd/update_openbsd/release.sh 2009/04/25 01:14:12 1.29 @@ -1,5 +1,5 @@ #!/bin/sh -# $RedRiver: release.sh,v 1.25 2008/11/03 18:46:15 andrew Exp $ +# $RedRiver: release.sh,v 1.28 2008/11/05 17:14:40 andrew Exp $ # # Copyright (c) 2002, 2008 Steven Roberts # @@ -25,8 +25,8 @@ XSRCDIR="/usr/xenocara" PORTSPATH="/usr/ports" -if [ -e /etc/releaserc ]; then - . /etc/releaserc +if [ -e /etc/release.conf ]; then + . /etc/release.conf fi export CVSROOT @@ -43,8 +43,8 @@ local _d for _d in /usr/src "${XSRCDIR}" "${PORTSPATH}"; do if [ -d $_d ]; then - echo [$_d] cvs update -r $TAG -Pd - cd $_d && cvs update -r $TAG -Pd + echo [$_d] opencvs update -r $TAG -PAd + cd $_d && opencvs update -r $TAG -PAd fi done } @@ -115,7 +115,7 @@ echo " system-release - Make and validate the system release" echo " xenocara - Build and install xenocara" echo " xenocara-release - Make and validate the xenocara release" -echo " full-release - Do system, xenocara, system-release, xenocara-release" +echo " full-release - xenocara, xenocara-release, system, system-release" echo } @@ -162,9 +162,9 @@ make_xenocara_release ;; full-release) -build_system build_xenocara make_xenocara_release +build_system make_system_release ;; *)