Changeset 27694

Show
Ignore:
Timestamp:
21.06.2013 17:56:09 (6 years ago)
Author:
ak19
Message:

Fixing up previous windows commit for linux

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/task.pl

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