Show
Ignore:
Timestamp:
03.08.2011 21:17:30 (8 years ago)
Author:
ak19
Message:

The method of locating perl has changed once more: util now defines the fuction get_perl_exec which is used by other scripts to obtain the path to the perl executable they should use.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/cgiactions/indexaction.pm

    r24192 r24362  
    2929 
    3030use strict; 
    31  
     31use util; 
    3232use cgiactions::baseaction; 
    33 use Config; # for getting the perlpath in the recommended way 
    3433 
    3534 
    3635@indexaction::ISA = ('baseaction'); 
    37  
    38  
    39  
    40  
    41  
    42  
    4336 
    4437# 'a' for action, and 'c' for collection are also compulsorary, and 
     
    133126 
    134127    my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 
    135     my $cmd = "\"$Config{perlpath}\" -S full-import.pl \"$collect\""; 
     128    my $cmd = "\"".&util::get_perl_exec()."\" -S full-import.pl \"$collect\""; 
    136129 
    137130    my ($status,$report) = $self->run_build_cmd($cmd); 
     
    172165 
    173166    my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 
    174     my $cmd = "\"$Config{perlpath}\" -S full-buildcol.pl \"$collect\""; 
     167    my $cmd = "\"".&util::get_perl_exec()."\" -S full-buildcol.pl \"$collect\""; 
    175168 
    176169    my ($status,$report) = $self->run_build_cmd($cmd); 
     
    211204 
    212205    my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 
    213     my $cmd = "\"$Config{perlpath}\" -S full-rebuild.pl \"$collect\""; 
     206    my $cmd = "\"".&util::get_perl_exec()."\" -S full-rebuild.pl \"$collect\""; 
    214207 
    215208    my ($status,$report) = $self->run_build_cmd($cmd); 
     
    251244 
    252245    my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 
    253     my $cmd = "\"$Config{perlpath}\" -S incremental-import.pl \"$collect\""; 
     246    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-import.pl \"$collect\""; 
    254247 
    255248    my ($status,$report) = $self->run_build_cmd($cmd); 
     
    292285 
    293286    my $bin_script = &util::filename_cat($gsdl_home,"bin","script"); 
    294     my $cmd = "\"$Config{perlpath}\" -S incremental-buildcol.pl \"$collect\""; 
     287    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-buildcol.pl \"$collect\""; 
    295288 
    296289    my ($status,$report) = $self->run_build_cmd($cmd); 
     
    329322    $self->lock_collection($username, $collect); 
    330323 
    331     my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl \"$collect\""; 
     324    my $cmd = "\"".&util::get_perl_exec()."\" -S incremental-rebuild.pl \"$collect\""; 
    332325 
    333326    my ($status,$report) = $self->run_build_cmd($cmd);