Changeset 21774 for other-projects/nightly-tasks/snapshot/trunk/lib.pl

Timestamp:

2010-03-09T15:57:52+13:00 (14 years ago)

Author:

oranfry

Message:

different method for uploading

File:

• other-projects/nightly-tasks/snapshot/trunk/lib.pl (modified) (2 diffs)

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

@@ -93 +93 @@
 
     if ( ! -d "$release_dir/products" ) {
-        die "error: products directory doesn't exist, exiting\n";
+        die "error: products directory doesn't exist, exiting. (Well, not that exciting, a bit of a downer really...)";
     }
+
+    #copy products to a temporary folder, giving them their new names
+        if ( ! -d "$release_dir/uploads" ) {
+        system( "rm -rf '$release_dir/uploads'" );
+    }
+    mkdir "$release_dir/uploads";
 
     @files = <$release_dir/products/*>;
@@ -100 +106 @@
     for my $file ( @files ) {
         my $filename = basename($file);
-        if ( !$only_upload || $filename =~ $only_upload ) {
+        #munge
+        for my $m ( @munges ) {
+            $doit="\$filename =~ $m"; eval "$doit";
+        }
 
-            #munge
-            for my $m ( @munges ) {
-                $doit="\$filename =~ $m"; eval "$doit";
-            }
-
-            #upload
-            print "Uploading '" . basename($file) . "' to '$filename'\n";
-            my $command = "scp";
-            if ( $^O eq "MSWin32" ) {
-                $command = "pscp";
-            }
-            if ( exists $ENV{'UPLOAD_IDENTITY_FILE'} ) {
-                $command .= " -i \"$ENV{'UPLOAD_IDENTITY_FILE'}\"";
-            }
-            $command .= " \"$file\" \"$ENV{'UPLOAD_DIR'}/$filename\"";
-            system($command);
-
-        } else {
-            print "Skipping upload of '$filename'\n";
-        }
+        #upload
+        print "Will upload '" . basename($file) . "' to '$filename'\n";
+        system( "cp '$file' '$release_dir/uploads/$filename'" );
     }
+    my $command = "cd $release_dir/uploads && tar -cz * | ";
+    $command .= ($^O eq "MSWin32" ? "putty" : "ssh");
+    $command .= " -i '$ENV{'IDENTITY_FILE'}' nzdl\@puka.cs.waikato.ac.nz";
+    #system("$command");
+    print "$command\n";
 }