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/bin/script/incremental-rebuild.pl

    r24192 r24362  
    3939} 
    4040 
    41  
    4241use strict; 
    43  
    44 use Config; # for getting the perlpath in the recommended way 
    4542use util; 
    4643 
     
    8582    my $final_status = 0; 
    8683     
    87     my $launch_cmd = ""; 
    88     if($ENV{'PERLPATH'}) { 
    8984    # need to ensure that the path to perl is quoted (in case there's spaces in it) 
    90     if($ENV{'GSDLOS'} =~ m/windows/) { 
    91         $launch_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S "; 
    92     } else { 
    93         $launch_cmd = "\"$ENV{'PERLPATH'}/perl\" -S "; 
    94     } 
    95     } else { 
    96     #Config{perlpath}, like $^X, is a special variable containing the full path to the current perl executable we are in 
    97     $launch_cmd = "\"$Config{perlpath}\" -S "; 
    98     } 
     85    my $launch_cmd = "\"".&util::get_perl_exec()."\" -S ";     
    9986 
    10087    print STDERR "\n";