Changeset 34941 for other-projects/nightly-tasks/diffcol/trunk
- Timestamp:
- 2021-02-28T23:06:44+13:00 (3 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/nightly-tasks/diffcol/trunk/task.pl
r34520 r34941 43 43 } 44 44 45 # we're using a GS compiled up wget with https support (at release-kits/bin, on PATH) 46 # But we may need to use --no-check-certificate for some https urls. 47 my $wget = "wget --no-check-certificate"; 45 48 46 49 my $sep = $isWin ? "\\" : "/"; … … 609 612 { 610 613 # current revision is 27763, but using "head" works 611 my $PDFBOX_TRAC_URL="http ://trac.greenstone.org/export/head/gs2-extensions/pdf-box/trunk/pdf-box-java"; # both for .zip and .tar.gz extension614 my $PDFBOX_TRAC_URL="https://trac.greenstone.org/export/head/gs2-extensions/pdf-box/trunk/pdf-box-java"; # both for .zip and .tar.gz extension 612 615 #"http://trac.greenstone.org/export/".$ENV{'SVN_OPT_REV'}."/gs2-extensions/pdf-box/trunk/pdf-box-java"; 613 616 … … 618 621 my $cmd = ""; 619 622 if ($isWin) { 620 $cmd = "setup.bat && cd ext && wget $PDFBOX_TRAC_URL.zip && unzip pdf-box-java.zip";623 $cmd = "setup.bat && cd ext && $wget $PDFBOX_TRAC_URL.zip && unzip pdf-box-java.zip"; 621 624 622 625 } elsif ($isMac) { # need to use curl not wget … … 624 627 } 625 628 else { # linux 626 $cmd = "bash -c \"export GSDLHOME=&& source setup.bash && cd ext && wget $PDFBOX_TRAC_URL.tar.gz && tar -xzf pdf-box-java.tar.gz\"";629 $cmd = "bash -c \"export GSDLHOME=&& source setup.bash && cd ext && $wget $PDFBOX_TRAC_URL.tar.gz && tar -xzf pdf-box-java.tar.gz\""; 627 630 } 628 631 my $status = system $cmd; … … 636 639 { 637 640 # current revision is 27763, but using "head" works 638 my $OOEXT_TRAC_URL="http ://trac.greenstone.org/export/head/gs2-extensions/open-office/trunk/open-office-java"; # both for .zip and .tar.gz extension641 my $OOEXT_TRAC_URL="https://trac.greenstone.org/export/head/gs2-extensions/open-office/trunk/open-office-java"; # both for .zip and .tar.gz extension 639 642 #"http://trac.greenstone.org/export/".$ENV{'SVN_OPT_REV'}."/gs2-extensions/open-office/trunk/open-office-java"; 640 643 … … 645 648 my $cmd = ""; 646 649 if ($isWin) { 647 $cmd = "setup.bat && cd ext && wget $OOEXT_TRAC_URL.zip && unzip open-office-java.zip";650 $cmd = "setup.bat && cd ext && $wget $OOEXT_TRAC_URL.zip && unzip open-office-java.zip"; 648 651 649 652 } elsif ($isMac) { # need to use curl not wget … … 651 654 } 652 655 else { # linux 653 $cmd = "bash -c \"export GSDLHOME=&& source setup.bash && cd ext && wget $OOEXT_TRAC_URL.tar.gz && tar -xzf open-office-java.tar.gz\"";656 $cmd = "bash -c \"export GSDLHOME=&& source setup.bash && cd ext && $wget $OOEXT_TRAC_URL.tar.gz && tar -xzf open-office-java.tar.gz\""; 654 657 } 655 658 my $status = system $cmd; … … 669 672 my $cmd = ""; 670 673 if($isMac) { 671 $cmd = "cd $gsfolder/bin/darwin && curl http ://www.greenstone.org/caveat-emptor/IsisGdl.macleopard > IsisGdl && chmod u+x IsisGdl";674 $cmd = "cd $gsfolder/bin/darwin && curl https://www.greenstone.org/caveat-emptor/IsisGdl.macleopard > IsisGdl && chmod u+x IsisGdl"; 672 675 } else { # linux 673 $cmd = "cd $gsfolder/bin/linux && wget http://www.greenstone.org/caveat-emptor/IsisGdl.bin32 && mv IsisGdl.bin32 IsisGdl && chmod u+x IsisGdl";676 $cmd = "cd $gsfolder/bin/linux && $wget https://www.greenstone.org/caveat-emptor/IsisGdl.bin32 && mv IsisGdl.bin32 IsisGdl && chmod u+x IsisGdl"; 674 677 } 675 678 my $isis_status = system $cmd; … … 1100 1103 $ENV{'IDENTITY_FILE_ED25519'} = "$ENV{'IDENTITY_DIR'}${sep}upload-" . $ENV{'SNAPSHOT_MODE'} ."-ed25519". ($^O eq "MSWin32" ? ".ppk" : ""); 1101 1104 1102 if (-f $ENV{'IDENTITY_FILE_ED25519'}) { 1105 if (-f $ENV{'IDENTITY_FILE_ED25519'}) { 1103 1106 # for now, upload a copy to the new new machine, later to replace puka 1104 $command = "cd \"$ENV{'UPLOAD_DIR'}\" && tar -c *.htm* | "; #&& cat *.html | "; # && tar -c * |1107 my $command = "cd \"$ENV{'UPLOAD_DIR'}\" && tar -c *.htm* | "; #&& cat *.html | "; # && tar -c * | 1105 1108 $command .= ($^O eq "MSWin32" ? "plink" : "ssh"); 1106 1109 $command .= " -T -i \"$ENV{'IDENTITY_FILE_ED25519'}\" nzdl-gsorg\@www-internal.greenstone.org"; 1107 1110 #print "$command\n"; 1108 $status = system("$command");1111 my $status = system("$command"); 1109 1112 if($status != 0) { 1110 1113 print STDERR "*** Failed to upload test report to www-internal $status\n";
Note:
See TracChangeset
for help on using the changeset viewer.