Changeset 36535 for main/trunk

Timestamp:

2022-08-30T10:52:51+12:00 (20 months ago)

Author:

kjdon

Message:

updating this to use 7Zip, as system tar and release-kits gnu tar didn't work properly on new windows build machine

File:

• main/trunk/gs-release-builder/upload-to-www-internal-windows.pl (modified) (3 diffs)

main/trunk/gs-release-builder/upload-to-www-internal-windows.pl

@@ -1 @@
-#!/usr/bin/perl -w
+#!C:\greenstone\gs-release-builder\packages\strawberry-perl-5.18\perl\bin\perl.exe -w
 
 use strict;
 use File::Copy;
 
-my $tar = "\"C:\\greenstone\\gs-release-builder\\release-kits\\bin\\tar.exe\"";
+# The following is GNU tar, and I found on the windows machine build machine it wasn't preserving capitalisation
+#my $tar = "\"C:\\greenstone\\gs-release-builder\\release-kits\\bin\\tar.exe\" -c ";
+# the following uses tar from C:\Windows\System32\tar.exe - this tar cannot output to standard out
+# my $tar = "tar -c ";
+# the following uses 7Zip and seems to work.
+# a (create), -ttar (type of archive = tar) -an (disable archive_name field - otherwise it will try to use one of the input files as the field name) -so (output to stdout)
+my $tar = "\"C:\\Program Files\\7-Zip\\7z\" a -an -ttar -so ";
 
 #my $set = `set`;
@@ -12 +18 @@
 my $keys_dir = "C:\\greenstone\\gs-release-builder\\keys\\";
 
-my @snap_dirs = ("gs2-caveat", "poo", "gs3-caveat"); # diffcoll?
+my @snap_dirs = ("gs2-caveat", "gs3-caveat"); # diffcoll?
 #my $private_key_file = $keys_dir . "kjdon-linux-labs.ppk";
-#die "Couldn't find jumphost key file $private_key_file\n" unless -e $private_key_file;
+#die "Couldn't find jumphost key file $private_key_file\n" unless -e $private_key_file; - don't need to use the jumphost now
 foreach my $dir (@snap_dirs) {
     opendir (DIR, "$main_snapshot_dir$dir") || next;
@@ -27 +33 @@
         }
     #   copy ($private_key_file, $new_dir);
-#       my $command = "cd  $new_dir && $tar -c rk* Greenstone* | plink -proxycmd \"plink -i kjdon-linux-labs.ppk kjdon\@linux-labs.cms.waikato.ac.nz -nc %host:%port\" -T -i ".$keys_dir."upload-caveat-ed25519.ppk nzdl-gsorg\@www-internal.greenstone.org";
-        my $command = "cd $new_dir && $tar -c rk* Greenstone* | plink -T -i ".$keys_dir."upload-caveat-ed25519.ppk nzdl-gsorg\@www-internal.greenstone.org";
+#       my $command = "cd  $new_dir && $tar rk* Greenstone* | plink -proxycmd \"plink -i kjdon-linux-labs.ppk kjdon\@linux-labs.cms.waikato.ac.nz -nc %host:%port\" -T -i ".$keys_dir."upload-caveat-ed25519.ppk nzdl-gsorg\@www-internal.greenstone.org";
+        my $command = "cd $new_dir && $tar rk* Greenstone* | plink -T -i ".$keys_dir."upload-caveat-ed25519.ppk nzdl-gsorg\@www-internal.greenstone.org";
         print "About to run: $command\n";
         STDOUT->flush();