Show
Ignore:
Timestamp:
10.11.2009 20:52:58 (11 years ago)
Author:
oranfry
Message:

Since we can now have a Perl installation inside Greenstone on linux as well, full and incremental build and import perl scripts also launch perl with the -S flag in the Linux case now (not just in the Windows case anymore).

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/bin/script/full-buildcol.pl

    r19620 r20925  
    4040 
    4141my $buildcol_cmd = "buildcol.pl -removeold $quoted_argv"; 
    42 if($ENV{'GSDLOS'} =~ m/windows/) { 
    43     if($ENV{'PERLPATH'}) { 
    44     # need to ensure that the path to perl is quoted (in case there's spaces in it) 
     42if($ENV{'PERLPATH'}) { 
     43    # need to ensure that the path to perl is quoted (in case there's spaces in it) 
     44    if($ENV{'GSDLOS'} =~ m/windows/) { 
    4545    $buildcol_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S $buildcol_cmd"; 
    4646    } else { 
    47     $buildcol_cmd = "perl -S $buildcol_cmd"; 
     47    $buildcol_cmd = "\"$ENV{'PERLPATH'}/perl\" -S $buildcol_cmd"; 
    4848    } 
     49} else { 
     50    $buildcol_cmd = "perl -S $buildcol_cmd"; 
    4951} 
    5052