[m-rev.] diff: fix installation of ROTDs on web site

[Fergus Henderson]

Estimated hours taken: 0.5
Branches: main

tools/test_mercury:
	Use /home/mercury/public/installed_w3 rather than
	/home/mercury5/installed_w3.
	Report an error if we can't copy the ROTD distribution
	to the ftp or web sites.

Workspace: /mnt/ceres/home/ceres/fjh/mercury
Index: tools/test_mercury
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/test_mercury,v
retrieving revision 1.241
diff -u -d -r1.241 test_mercury
--- tools/test_mercury	16 Oct 2003 01:13:24 -0000	1.241
+++ tools/test_mercury	2 Dec 2003 04:36:51 -0000
@@ -304,8 +304,8 @@
 
 BETA_FTPHOST=ftp.mercury.cs.mu.oz.au
 BETA_FTPDIR=/home/ftp/pub/mercury/beta-releases/$FTP_DIR_NAME
-BETA_WEBDIR=/home/mercury5/installed_w3/download/files/beta-releases/$FTP_DIR_NAME
-BETA_WEBDIR_TOP=/home/mercury5/installed_w3/download/files
+BETA_WEBDIR_TOP=/home/mercury/public/installed_w3/download/files
+BETA_WEBDIR=$BETA_WEBDIR_TOP/beta-releases/$FTP_DIR_NAME
 
 STABLE=$HOSTDIR/$INSTALL_DIR_NAME-stable
 UNSTABLE=$HOSTDIR/$INSTALL_DIR_NAME-unstable
@@ -1025,7 +1025,8 @@
 	rm -f $BETA_WEBDIR/mercury-extras-$RELEASE_VERSION_PATTERN-unstable.tar.gz &&
 	rm -f $BETA_WEBDIR/mercury-tests-$RELEASE_VERSION_PATTERN-unstable.tar.gz &&
 	rm -f $BETA_WEBDIR/mercury-*-$RELEASE_VERSION_PATTERN-unstable.txt &&
-	cp $UNSTABLE/mercury-*-$version-unstable.* $BETA_WEBDIR
+	cp $UNSTABLE/mercury-*-$version-unstable.* $BETA_WEBDIR \
+	|| set_status "copying ROTD"
 	;;
 esac
 case $HOST in $GCC_ROTD_HOST)
@@ -1037,7 +1038,8 @@
 	    $BETA_FTPHOST:$BETA_FTPDIR/mercury-gcc-$version-unstable.tar.gz  &&
 	rm -f $BETA_WEBDIR/mercury-gcc-$RELEASE_VERSION_PATTERN-unstable.tar.gz &&
 	cp $UNSTABLE/mercury-gcc-$version.tar.gz \
-		$BETA_WEBDIR/mercury-gcc-$version-unstable.tar.gz
+		$BETA_WEBDIR/mercury-gcc-$version-unstable.tar.gz \
+	|| set_status "copying mercury-gcc ROTD"
 	;;
 esac
 
@@ -1291,7 +1293,7 @@
     $ROTD_HOST)
 	echo "test_mercury generating www index files, starting at `date`" 1>&2
 	(
-	cd $BETA_WEBDIR_TOP
+	cd $BETA_WEBDIR_TOP &&
 	generate_index_html
 	) || set_status "generating www index"
 	echo "test_mercury generating www index files, finished at `date`" 1>&2

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------