Changeset 27667

Timestamp:

2013-06-19T21:44:50+12:00 (11 years ago)

Author:

ak19

Message:

Another change to not be linux/mac specific, so that the diffcol task will support windows

File:

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

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

@@ -380 +380 @@
     print STDERR "$collection - Diffing:\n";
     my $diffcol_dir = &filename_concat($ENV{'TASK_HOME'},"diffcol");
-    $cmd = "./diffcol.pl -output xml -verbosity 10 $collection";    
+    $cmd = "diffcol.pl -output xml -verbosity 10 $collection"; # need to run with ./diffcol.pl if bash script
     &run_diff_script($cmd, $xml_fh, $diffcol_dir);
 
@@ -402 +402 @@
     # we're in greenstone_home now
     if(!$isWin) {   
-    $cmd = "bash -c \"export GSDLHOME=&& source $setup_script.bash && cd $diffcol_dir && $cmd\"";
+    $cmd = "bash -c \"export GSDLHOME=&& source $setup_script.bash && cd $diffcol_dir && ./$cmd\"";
 
     } else { # Need to prefix cmd -c/-k as necessary