Ignore:
Timestamp:
11/05/13 19:44:25 (7 years ago)
Author:
ak19
Message:

Related to previous commit. Need Leopard's IsisGdl binary on Lion machine. Turns out Leopard is 32 bit after all.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/task.pl

    r28605 r28606  
    453453    }
    454454
    455     &getIsisGdl("$ENV{'DATA_DIR'}/$gsdl/bin/linux");
     455    &getIsisGdl("$ENV{'DATA_DIR'}/$gsdl");
    456456   
    457457    # set the path to the greenstone_home variable                             
     
    488488
    489489sub getIsisGdl {
    490     my $bin_lin_folder = shift(@_);
     490    my $gsfolder = shift(@_);
    491491   
    492     if(!$isWin && !$isMac) {
     492    if(!$isWin) {
    493493    my $bit_arch=`uname -m`;
    494494    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         }
    496501        my $isis_status = system $cmd;
    497502        if($isis_status != 0) {
    498         print STDERR "Unable to get IsisGdl.bin32 from caveat page\n";
     503        print STDERR "Unable to get IsisGdl from caveat page\n";
    499504        }
    500505    }
     
    522527    }
    523528
    524     &getIsisGdl("$greenstone_home/bin/linux");
     529    &getIsisGdl("$greenstone_home");
    525530
    526531    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.