Changeset 28606 for other-projects/nightly-tasks/diffcol/trunk

Timestamp:

2013-11-05T19:44:25+13:00 (10 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:

• other-projects/nightly-tasks/diffcol/trunk/task.pl (modified) (3 diffs)

other-projects/nightly-tasks/diffcol/trunk/task.pl

@@ -453 +453 @@
     }
 
-    &getIsisGdl("$ENV{'DATA_DIR'}/$gsdl/bin/linux");
+    &getIsisGdl("$ENV{'DATA_DIR'}/$gsdl");
     
     # set the path to the greenstone_home variable                             
@@ -488 +488 @@
 
 sub getIsisGdl {
-    my $bin_lin_folder = shift(@_);
+    my $gsfolder = shift(@_);
     
-    if(!$isWin && !$isMac) {
+    if(!$isWin) {
     my $bit_arch=`uname -m`;
     if ($bit_arch =~ m/64$/) {
-        my $cmd = "cd $bin_lin_folder && wget http://www.greenstone.org/caveat-emptor/IsisGdl.bin32 && mv IsisGdl.bin32 IsisGdl && chmod u+x IsisGdl";
+        my $cmd = "";
+         if($isMac) {
+             $cmd = "cd $gsfolder/bin/darwin && curl http://www.greenstone.org/caveat-emptor/IsisGdl.macleopard > IsisGdl && chmod u+x IsisGdl";
+         } else { # linux
+             $cmd = "cd $gsfolder/bin/linux && wget http://www.greenstone.org/caveat-emptor/IsisGdl.bin32 && mv IsisGdl.bin32 IsisGdl && chmod u+x IsisGdl";
+         }
         my $isis_status = system $cmd;
         if($isis_status != 0) {
-        print STDERR "Unable to get IsisGdl.bin32 from caveat page\n";
+        print STDERR "Unable to get IsisGdl from caveat page\n";
         }
     }
@@ -522 +527 @@
     }
 
-    &getIsisGdl("$greenstone_home/bin/linux");
+    &getIsisGdl("$greenstone_home");
 
     open (my $xml_fh, '>'.$xmlout) || die "Could not open xml file $xmlout for appending: $!\n";