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/full-import.pl

    r24192 r24362  
    3333BEGIN { 
    3434    die "GSDLOS not set\n" unless defined $ENV{'GSDLOS'}; 
     35    unshift (@INC, "$ENV{'GSDLHOME'}/perllib"); 
    3536} 
    3637 
    3738use strict; 
    38 use Config; # for getting the perlpath in the recommended way 
     39use util; 
    3940 
    4041my $quoted_argv = join(" ", map { "\"$_\"" } @ARGV); 
    4142 
    42 my $import_cmd = "import.pl -removeold $quoted_argv"; 
    43 if($ENV{'PERLPATH'}) { 
    44     # need to ensure that the path to perl is quoted (in case there's spaces in it) 
    45     if($ENV{'GSDLOS'} =~ m/windows/) { 
    46     $import_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S $import_cmd"; 
    47     } else { 
    48     $import_cmd = "\"$ENV{'PERLPATH'}/perl\" -S $import_cmd"; 
    49     } 
    50 } else { 
    51     #Config{perlpath}, like $^X, is a special variable containing the full path to the current perl executable we are in 
    52     $import_cmd = "\"$Config{perlpath}\" -S $import_cmd"; 
    53 } 
     43# need to ensure that the path to perl is quoted (in case there's spaces in it) 
     44my $import_cmd = "\"".&util::get_perl_exec()."\" -S import.pl -removeold $quoted_argv";    
    5445 
    5546my $import_status = system($import_cmd)/256;