Changeset 27694 for other-projects/nightly-tasks/diffcol

Timestamp:

2013-06-21T17:56:09+12:00 (11 years ago)

Author:

ak19

Message:

Fixing up previous windows commit for linux

File:

• other-projects/nightly-tasks/diffcol/trunk/task.pl (modified) (2 diffs)

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

@@ -569 +569 @@
     # copy the reports across with different names: with OS prefixed to them. And for the HTML file on Win, rename to HTM
     # html files uploaded from windows to nzdl are empty for no reason. Uploading as htm seems to work
-    my $os = $^O;
-    (my $os_entry = $entry) =~ s@\[email protected]@ if $isWin;
-    $os_entry = $^O."-$os_entry";   
+    my $os_entry = $entry; 
+    $os_entry =~ s@\[email protected]@ if $isWin;
+    $os_entry = $^O."-diffcol-$os_entry";   
     
     # get the absolute path to the original files before copying them over
@@ -597 +597 @@
     # if you need to touch the file on windows: http://stackoverflow.com/questions/51435/windows-version-of-the-unix-touch-command
     
-    # the report we want to upload is actually just report-$dateid.html
+    # the report we want to upload is actually just os-diffcol-report-$dateid.html
     my $command = "cd \"$ENV{'UPLOAD_DIR'}\" && tar -c *.htm* | "; #&& cat *.html | "; # && tar -c * |
     $command .= ($^O eq "MSWin32" ? "plink" : "ssh");