--- a/cron-script.sh	Wed Feb 28 23:26:59 2007 +0000
+++ b/cron-script.sh	Wed Feb 28 23:28:48 2007 +0000
@@ -2,11 +2,11 @@
 
 # Sample usage in crontab:
 # Run, Mon-Fri at 1:30am. Add to build user's crontab.
-#   30 1 * * 1-5 . /jds/cbe/bin/env.sh; cd /jds/spec-files/Solaris; I_KNOW_WHAT_IM_DOING=yes ./cron-script.sh
+#   30 1 * * 1-5 . /jds/cbe/bin/env.sh; cd /jds/spec-files; I_KNOW_WHAT_IM_DOING=yes ./cron-script.sh
 #
 # The same with a jail. Add to root's crontab. Example assumes 'gbuild' is the
 # build user
-#   30 1 * * 1-5 /usr/sbin/chroot /path/to/jail/root /usr/bin/su - gbuild -c ". /jds/cbe/bin/env.sh; cd /jds/spec-files/Solaris; I_KNOW_WHAT_IM_DOING=yes ./cron-script.sh"
+#   30 1 * * 1-5 /usr/sbin/chroot /path/to/jail/root /usr/bin/su - gbuild -c ". /jds/cbe/bin/env.sh; cd /jds/spec-files; I_KNOW_WHAT_IM_DOING=yes ./cron-script.sh"
 #
 # $Id$
 
@@ -104,12 +104,9 @@
 
 cd $SPECDIR || fatal_error "$SPECDIR not found"
 
-cd ..
-
 #revert any local changes
 svn revert -R .
 
-#cvs -q up -Pd > /dev/null 2>&1 || fatal_error "CVS update failed"
 # checkout-out SVN copy *MUST* be read-only, or "update" needs passwd
 svn -q up > /dev/null 2>&1 || fatal_error "SVN update failed"
 cd $SPECDIR
@@ -121,12 +118,12 @@
 pkgtool uninstall-pkgs --with-l10n --with-tjds *.spec >/dev/null
 # remove-gnome will now remove anything left from uninstall-pkgs in case
 # or a packaging change for example
-./remove-gnome --version jds -q -f --no_extras > /dev/null 2>&1
+$SPECDIR/scripts/remove-gnome --version jds -q -f --no_extras > /dev/null 2>&1
 
 rm -rf /jds/packages/PKGS/*
 rm -rf /jds/packages/SPKGS/*
 rm -rf /jds/packages/BUILD/*
-rm -rf /var/tmp/*-build
+rm -rf /var/tmp/pkgbuild-*/*
 
 # if the log directory exists, open a new one with numbered suffix
 NEW_LOGDIR=$LOGDIR
@@ -145,13 +142,13 @@
 # Rebuild the manpage tarballs
 cd $SPECDIR/manpages
 make
-cd $SPECDIR/../po-sun
+cd $SPECDIR/po-sun
 make clean
 make
 cd $SPECDIR
 
 # start the build
-pkgtool -v --nightly --date "$RELEASE_DATE" build *.spec \
+pkgtool -v --nightly --date "$RELEASE_DATE" build *.spec closed/*.spec \
         --logdir=$WEBROOT/$LOGDIR \
         --logdir-url=http://gnome.ireland/$LOGDIR \
 	[email protected] \
@@ -195,7 +192,7 @@
 grep 'is an absolute symlink' $WEBROOT/$LOGDIR/*.log >>/tmp/build.log.$$
 
 # Count the number of local patches.
-patch_count=`ls $SPECDIR/../patches/*.diff | wc -l`
+patch_count=`ls $SPECDIR/patches/*.diff | wc -l`
 echo "PATCH COUNT: $patch_count local patches used in this build.">>/tmp/build.log.$$
 
 # send warnings, errors and summary in email