Changeset 28606 for other-projects/nightly-tasks/diffcol/trunk/task.pl
- Timestamp:
- 2013-11-05T19:44:25+13:00 (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/nightly-tasks/diffcol/trunk/task.pl
r28605 r28606 453 453 } 454 454 455 &getIsisGdl("$ENV{'DATA_DIR'}/$gsdl /bin/linux");455 &getIsisGdl("$ENV{'DATA_DIR'}/$gsdl"); 456 456 457 457 # set the path to the greenstone_home variable … … 488 488 489 489 sub getIsisGdl { 490 my $ bin_lin_folder = shift(@_);490 my $gsfolder = shift(@_); 491 491 492 if(!$isWin && !$isMac) {492 if(!$isWin) { 493 493 my $bit_arch=`uname -m`; 494 494 if ($bit_arch =~ m/64$/) { 495 my $cmd = "cd $bin_lin_folder && wget http://www.greenstone.org/caveat-emptor/IsisGdl.bin32 && mv IsisGdl.bin32 IsisGdl && chmod u+x IsisGdl"; 495 my $cmd = ""; 496 if($isMac) { 497 $cmd = "cd $gsfolder/bin/darwin && curl http://www.greenstone.org/caveat-emptor/IsisGdl.macleopard > IsisGdl && chmod u+x IsisGdl"; 498 } else { # linux 499 $cmd = "cd $gsfolder/bin/linux && wget http://www.greenstone.org/caveat-emptor/IsisGdl.bin32 && mv IsisGdl.bin32 IsisGdl && chmod u+x IsisGdl"; 500 } 496 501 my $isis_status = system $cmd; 497 502 if($isis_status != 0) { 498 print STDERR "Unable to get IsisGdl .bin32from caveat page\n";503 print STDERR "Unable to get IsisGdl from caveat page\n"; 499 504 } 500 505 } … … 522 527 } 523 528 524 &getIsisGdl("$greenstone_home /bin/linux");529 &getIsisGdl("$greenstone_home"); 525 530 526 531 open (my $xml_fh, '>'.$xmlout) || die "Could not open xml file $xmlout for appending: $!\n";
Note:
See TracChangeset
for help on using the changeset viewer.