===================================================================
RCS file: /cvs/openbsd/update_openbsd/release.sh,v
retrieving revision 1.8
retrieving revision 1.12
diff -u -r1.8 -r1.12
--- openbsd/update_openbsd/release.sh	2006/11/08 04:07:46	1.8
+++ openbsd/update_openbsd/release.sh	2007/09/09 22:40:41	1.12
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: release.sh,v 1.7 2006/11/07 17:32:10 andrew Exp $
+# $RedRiver: release.sh,v 1.11 2007/05/04 20:57:34 andrew Exp $
 # Copyright (c) 2002 - 2006, FenderQ
 # All rights reserved.
 #
@@ -38,10 +38,10 @@
 
 DEST="/usr/dest"
 RELEASE="/usr/release"
-CVSTAG=${CVSTAG:=`uname -r | awk '{ sub("\\\.","_"); print "OPENBSD_" $0 }'`}
+CVSTAG=${CVSTAG:=`uname -sr | tr '[:lower:] .' '[:upper:]_'`}
 #SOURCES="src ports XF4"
 #SOURCES="src ports"
-SOURCES="src XF4"
+SOURCES="src ports XF4"
 
 # Anonymous CVS - http://www.openbsd.org/anoncvs.html
 CVSROOT="anoncvs@anoncvs3.usa.openbsd.org:/cvs"
@@ -137,11 +137,6 @@
 	echo
 }
 
-if [ `whoami` != "root" ]; then
-	echo "You probably should be root instead of `whoami` to run this safely." 
-	exit 1
-fi
-
 START=`date`
 echo
 echo "***** OpenBSD - Release Building *****"
@@ -153,6 +148,11 @@
 echo
 
 if [ $# = 0 ]; then usage; exit 1; fi
+
+if [ `id -u` != "0" ]; then
+	echo "You probably should be root instead of `whoami` to run this safely." 
+	exit 1
+fi
 
 for i in $*
 do