Changeset 29448

Show
Ignore:
Timestamp:
18.11.2014 19:55:54 (4 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:
2 modified

Legend:

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

    r29432 r29448  
    987987        my $perloutput = `perl -v`; 
    988988        $perloutput =~ s@.*\((v\d+(\.\d+)*)\).*@$1@s; 
    989         $ENV{'PATH'}="$ENV{'PERLPATH'}:$ENV{'PATH'}";        
     989        $ENV{'PATH'}="$ENV{'PERLPATH'}:$ENV{'PATH'}" if $ENV{'PERLPATH'}; 
    990990        print "<perl-version>Perl version: $perloutput</perl-version>\n"; # die "<error>Perl version: $perloutput</error>\n"; 
    991991    } 
  • other-projects/nightly-tasks/diffcol/trunk/task.pl

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