===================================================================
RCS file: /cvs/openbsd/update_openbsd/release.sh,v
retrieving revision 1.24
retrieving revision 1.28
diff -u -r1.24 -r1.28
--- openbsd/update_openbsd/release.sh	2008/10/20 23:06:57	1.24
+++ openbsd/update_openbsd/release.sh	2008/11/05 17:14:40	1.28
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver$
+# $RedRiver: release.sh,v 1.27 2008/11/05 16:43:57 andrew Exp $
 #
 # Copyright (c) 2002, 2008 Steven Roberts <sroberts@fenderq.com>
 #
@@ -25,9 +25,10 @@
 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
 
 if [ X"" != X"${_origtag}" ]; then
     TAG=$_origtag
@@ -70,7 +71,11 @@
 echo "---------- Make and validate the system release ----------"
 cd /usr/src/distrib/crunch && make obj depend && make all install
 export DESTDIR=$DEST; export RELEASEDIR=$RELEASE
-rm -rf $DESTDIR
+if [ X"$DESTDIR" == X"" ]; then
+	echo PLEASE SET \$DEST! >2&
+	exit
+fi
+rm -rf $DESTDIR/* $DESTDIR/.*
 mkdir -p $DESTDIR $RELEASEDIR
 cd /usr/src/etc && nice make release
 cd /usr/src/distrib/sets && sh checkflist
@@ -88,7 +93,11 @@
 make_xenocara_release() {
 echo "---------- Make and validate the xenocara release ----------"
 export DESTDIR=$DEST RELEASEDIR=$RELEASE
-rm -rf $DESTDIR
+if [ X"$DESTDIR" == X"" ]; then
+	echo PLEASE SET \$DEST! >2&
+	exit
+fi
+rm -rf $DESTDIR/* $DESTDIR/.*
 mkdir -p $DESTDIR $RELEASEDIR
 cd $XSRCDIR
 nice make release
@@ -106,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
 }
 
@@ -124,6 +133,9 @@
 echo " Kernel: $KERNEL-$ARCH"
 echo "   Dest: $DEST"
 echo "Release: $RELEASE"
+if [ X"$CVSROOT" != X"" ]; then
+	echo "   Root: $CVSROOT"
+fi
 echo
 
 if [ $# = 0 ]; then usage; exit 1; fi
@@ -150,9 +162,9 @@
 make_xenocara_release
 ;;
 full-release)
-build_system
 build_xenocara
 make_xenocara_release
+build_system
 make_system_release
 ;;
 *)