Changeset 29448 for other-projects/nightly-tasks

Timestamp:

2014-11-18T19:55:54+13:00 (9 years ago)

Author:

ak19

Message:

Minor changes to make a fresh installation of diffcol work faster: the diffcol-data dir must exist before hand. PERLPATH need not be set.

Location:

other-projects/nightly-tasks/diffcol/trunk

Files:

• diffcol/diffcol.pl (modified) (1 diff)
• task.pl (modified) (1 diff)

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

@@ -987 +987 @@
         my $perloutput = `perl -v`;
         $perloutput =~ s@.*\((v\d+(\.\d+)*)\).*@$1@s;
-        $ENV{'PATH'}="$ENV{'PERLPATH'}:$ENV{'PATH'}";       
+        $ENV{'PATH'}="$ENV{'PERLPATH'}:$ENV{'PATH'}" if $ENV{'PERLPATH'};
         print "<perl-version>Perl version: $perloutput</perl-version>\n"; # die "<error>Perl version: $perloutput</error>\n";
     }

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

@@ -98 +98 @@
 $ENV{'GSDL_SMTP'} = ""; #"smtp.gmail.com";
 ##print STDERR "@@@ email: ".$ENV{'MONITOR_EMAIL'}."\n";
+
+# When installing diffcol the first time, force the user to create the data-dir and upload-dir
+die "\n@@@@ data dir: ".$ENV{'DATA_DIR'}." does not exist\n" unless (-d $ENV{'DATA_DIR'});
+die "\n@@@@ reports/upload dir: ".$ENV{'UPLOAD_DIR'}." does not exist\n" unless (-d $ENV{'UPLOAD_DIR'});
 
 # control if an existing compiled greenstone is used