Changeset 21773

Timestamp:

2010-03-09T15:33:45+13:00 (14 years ago)

Author:

oranfry

Message:

cant use ssh to get next version number, use http

File:

• other-projects/nightly-tasks/snapshot/trunk/task.pl (modified) (1 diff)

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

@@ -60 +60 @@
 if ( $ENV{'TASK_NAME'} =~ "caveat\$" ) {
     $ENV{'UPLOAD_DIR'}="nzdl\@puka.cs.waikato.ac.nz:/greenstone/greenstone.org/base/caveat-emptor";
-    $ENV{'snapshot_id2'}=`ssh nzdl\@puka.cs.waikato.ac.nz cat /greenstone/greenstone.org/base/next-release.txt`;
 
-    #TODO: generalise this for all oses!
-    chomp($ENV{'snapshot_id2'});
-    $ENV{'snapshot_id3'}=`ssh nzdl\@puka.cs.waikato.ac.nz cat /greenstone/greenstone.org/base/next-release-greenstone3.txt`;
-    chomp($ENV{'snapshot_id3'});
-
+    if ( $major_version == 2 ) {
+        $ENV{'snapshot_id2'} = `wget -O - http://www.greenstone.org/next-release.txt`;
+        chomp($ENV{'snapshot_id2'});
+    } else {
+        $ENV{'snapshot_id3'} = `wget -O - http://www.greenstone.org/next-release-greenstone3.txt`;
+        chomp($ENV{'snapshot_id3'});
+    }
+    
     #change the filenames to have the date in them
     $ENV{'munges'} = "s/$ENV{'snapshot_id2'}/$ENV{'snapshot_id2'}-candidate-" . get_date() . "/g ";