Changeset 27662 for other-projects/nightly-tasks

Timestamp:

2013-06-19T16:37:22+12:00 (11 years ago)

Author:

ak19

Message:

Dr Bainbridge fixed the dec regex problem and other regex issues.

File:

• other-projects/nightly-tasks/snapshot/trunk/task.pl (modified) (3 diffs)

other-projects/nightly-tasks/snapshot/trunk/task.pl

@@ -71 +71 @@
 
     if ( $major_version == 2 ) {
-        $ENV{'snapshot_id2'} = `$httpRetrieve http://www.greenstone.org/next-release.txt`;
+            $ENV{'snapshot_id2'} = `$httpRetrieve http://www.greenstone.org/next-release.txt`;
         chomp($ENV{'snapshot_id2'});
     } else {
@@ -79 +79 @@
     
     #change the filenames to have the date in them
-    $ENV{'munges'} = "s/$ENV{'snapshot_id2'}/$ENV{'snapshot_id2'}-candidate-" . get_date() . "/g ";
-    $ENV{'munges'} .= "s/$ENV{'snapshot_id3'}/$ENV{'snapshot_id3'}-candidate-" . get_date() . "/g";
+    my $id2 = $ENV{'snapshot_id2'};
+    (my $id2re = $id2) =~ s@\.@\\.@g; #copy id2 and then change idre, see http://www.perlmonks.org/?node_id=366431
+
+    my $id3 = $ENV{'snapshot_id3'};
+    (my $id3re = $id3) =~ s@\.@\\.@g;
+
+    $ENV{'munges'} = "s/-$id2re/-$id2-candidate-" . get_date() . "/g " if ($id2 =~ m/\S/);
+    $ENV{'munges'} .= "s/-$id3re/-$id3-candidate-" . get_date() . "/g" if ($id3 =~ m/\S/);
+
     # the above generates a list of regex. Have a \D (non-digit) prefixed to the value to be substituted, else
     # Greenstone-documented-examples-2013.06.18.tar.gz gets changed to Greenstone-documented-examples-2013.06-candidate-<daterepeat of 2013.06.18>.18.tar.gz
@@ -128 +135 @@
 
 #always rename the log not to clash with other files on puka
-$ENV{'munges'} = $ENV{'munges'} . " s/\.out/-" . get_date() . "-" . $^O . "-log.txt/";
+$ENV{'munges'} = $ENV{'munges'} . " s/\\.out\$/-" . get_date() . "-" . $^O . "-log.txt/";
 
 #choose a snapshot ID