Changeset 30357

Show
Ignore:
Timestamp:
18.12.2015 20:46:01 (4 years ago)
Author:
jmt12
Message:

Wrapped the code that checks the path for the perllib in a 'not-windows' test, as something about the drive path breaks the Perl's regular expression engine

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/perllib/dbutil.pm

    r30356 r30357  
    3737    } 
    3838    # Are we running standalone? In which case the INC won't be correct 
    39     my $perllib_path = $ENV{'GSDLHOME'} . '/perllib'; 
    40     my $all_inc = join(':', @INC); 
    41     if ($all_inc !~ /$perllib_path/) { 
    42     unshift(@INC, $perllib_path); 
    43     unshift(@INC, $ENV{'GSDLHOME'} . '/ext/parallel-building/perllib'); 
    44     unshift(@INC, $ENV{'GSDLHOME'} . '/ext/tdb/perllib'); 
     39    # - derp. Linux only sorry 
     40    if ($^O !~ /cygwin|MSWin32/) { 
     41    my $perllib_path = $ENV{'GSDLHOME'} . '/perllib'; 
     42    my $all_inc = join(':', @INC); 
     43    if ($all_inc !~ /$perllib_path/) { 
     44        unshift(@INC, $perllib_path); 
     45        unshift(@INC, $ENV{'GSDLHOME'} . '/ext/parallel-building/perllib'); 
     46        unshift(@INC, $ENV{'GSDLHOME'} . '/ext/tdb/perllib'); 
     47    } 
    4548    } 
    4649    ## You can uncomment and name a Driver here to test it compiles