[m-rev.] trivial diff: fix bugs in generate_index_html

[Fergus Henderson]

Estimated hours taken: 0.5
Branches: main

tools/generate_index_html:
	Fix some bugs where it was not handling RPM file names properly
	(RPMs file names uses underscores rather than dashes in some places).

Workspace: /home/jupiter/fjh/ws-jupiter/mercury
Index: tools/generate_index_html
===================================================================
RCS file: /home/mercury1/repository/mercury/tools/generate_index_html,v
retrieving revision 1.16
diff -u -d -r1.16 generate_index_html
--- tools/generate_index_html	16 Feb 2004 22:58:33 -0000	1.16
+++ tools/generate_index_html	16 Feb 2004 23:15:20 -0000
@@ -123,7 +123,7 @@
 
 	#echo "file=$file, date=$date"
 	case "$file" in
-	    *-rotd*-unstable*)
+	    *-rotd*[-_]unstable*)
 		release_name="Unstable snapshot $date"
 		release_id="rotd-$date-unstable"
 		release_id_underscores="rotd_${date_underscores}_unstable"
@@ -133,20 +133,20 @@
 		release_id="rotd-$date"
 		release_id_underscores="rotd_$date_underscores"
 		;;
-	    *-*([0-9.])-beta*-unstable*)
-		version=`expr "$file" : ".*-\([0-9.]*\)-beta.*-unstable.*"`
+	    *-*([0-9.])[-_]beta*[-_]unstable*)
+		version=`expr "$file" : ".*-\([0-9.]*\)[-_]beta.*[-_]unstable.*"`
 		release_name="Unstable $version beta $date"
 		release_id="$version-beta-$date-unstable"
 		release_id_underscores="${version}_beta_${date_underscores}_unstable"
 		;;
-	    *-*([0-9.])-beta*)
-		version=`expr "$file" : ".*-\([0-9.]*\)-beta.*"`
+	    *-*([0-9.])[-_]beta*)
+		version=`expr "$file" : ".*-\([0-9.]*\)[-_]beta.*"`
 		release_name="Stable $version beta $date"
 		release_id="$version-beta-$date"
 		release_id_underscores="${version}_beta_$date_underscores"
 		;;
-	    *-*([0-9.])*-unstable*)
-		version=`expr "$file" : ".*-\([0-9.]*[0-9]\).*-unstable.*"`
+	    *-*([0-9.])*[-_]unstable*)
+		version=`expr "$file" : ".*-\([0-9.]*[0-9]\).*[-_]unstable.*"`
 		release_name="Unstable release $version"
 		release_id="$version-unstable"
 		release_id_underscores="${version}_unstable"

-- 
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
--------------------------------------------------------------------------