Show
Ignore:
Timestamp:
09.03.2010 15:33:45 (10 years ago)
Author:
oranfry
Message:

cant use ssh to get next version number, use http

Files:
1 modified

Legend:

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

    r21730 r21773  
    6060if ( $ENV{'TASK_NAME'} =~ "caveat\$" ) { 
    6161    $ENV{'UPLOAD_DIR'}="nzdl\@puka.cs.waikato.ac.nz:/greenstone/greenstone.org/base/caveat-emptor"; 
    62     $ENV{'snapshot_id2'}=`ssh nzdl\@puka.cs.waikato.ac.nz cat /greenstone/greenstone.org/base/next-release.txt`; 
    6362 
    64     #TODO: generalise this for all oses! 
    65     chomp($ENV{'snapshot_id2'}); 
    66     $ENV{'snapshot_id3'}=`ssh nzdl\@puka.cs.waikato.ac.nz cat /greenstone/greenstone.org/base/next-release-greenstone3.txt`; 
    67     chomp($ENV{'snapshot_id3'}); 
    68  
     63    if ( $major_version == 2 ) { 
     64        $ENV{'snapshot_id2'} = `wget -O - http://www.greenstone.org/next-release.txt`; 
     65        chomp($ENV{'snapshot_id2'}); 
     66    } else { 
     67        $ENV{'snapshot_id3'} = `wget -O - http://www.greenstone.org/next-release-greenstone3.txt`; 
     68        chomp($ENV{'snapshot_id3'}); 
     69    } 
     70     
    6971    #change the filenames to have the date in them 
    7072    $ENV{'munges'} = "s/$ENV{'snapshot_id2'}/$ENV{'snapshot_id2'}-candidate-" . get_date() . "/g ";