Changeset 20925

Show
Ignore:
Timestamp:
10.11.2009 20:52:58 (10 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).

Location:
gsdl/trunk/bin/script
Files:
6 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 
  • gsdl/trunk/bin/script/full-import.pl

    r19620 r20925  
    4040 
    4141my $import_cmd = "import.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    $import_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S $import_cmd"; 
    4646    } else { 
    47     $import_cmd = "perl -S $import_cmd"; 
     47    $import_cmd = "\"$ENV{'PERLPATH'}/perl\" -S $import_cmd"; 
    4848    } 
     49} else { 
     50    $import_cmd = "perl -S $import_cmd"; 
    4951} 
    5052 
  • gsdl/trunk/bin/script/full-rebuild.pl

    r19620 r20925  
    104104 
    105105    my $launch_cmd = ""; 
    106     if($ENV{'GSDLOS'} =~ m/windows/) { 
    107     if($ENV{'PERLPATH'}) { 
    108         # need to ensure that the path to perl is quoted (in case there's spaces in it) 
     106    if($ENV{'PERLPATH'}) { 
     107    # need to ensure that the path to perl is quoted (in case there's spaces in it) 
     108    if($ENV{'GSDLOS'} =~ m/windows/) { 
    109109        $launch_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S "; 
    110110    } else { 
    111         $launch_cmd = "perl -S "; 
     111        $launch_cmd = "\"$ENV{'PERLPATH'}/perl\" -S "; 
    112112    } 
     113    } else { 
     114    $launch_cmd = "perl -S "; 
    113115    } 
    114116     
  • gsdl/trunk/bin/script/incremental-buildcol.pl

    r20606 r20925  
    108108     
    109109    my $buildcol_cmd = "buildcol.pl"; 
    110     if($ENV{'GSDLOS'} =~ m/windows/) { 
    111     if($ENV{'PERLPATH'}) { 
    112         # need to ensure that the path to perl is quoted (in case there's spaces in it) 
     110    if($ENV{'PERLPATH'}) { 
     111    # need to ensure that the path to perl is quoted (in case there's spaces in it) 
     112    if($ENV{'GSDLOS'} =~ m/windows/) {   
    113113        $buildcol_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S $buildcol_cmd"; 
    114114    } else { 
    115         $buildcol_cmd = "perl -S $buildcol_cmd"; 
     115        $buildcol_cmd = "\"$ENV{'PERLPATH'}/perl\" -S $buildcol_cmd"; 
    116116    } 
     117    } else { 
     118    $buildcol_cmd = "perl -S $buildcol_cmd"; 
    117119    } 
    118120 
  • gsdl/trunk/bin/script/incremental-import.pl

    r20606 r20925  
    107107 
    108108    my $import_cmd = "import.pl"; 
    109     if($ENV{'GSDLOS'} =~ m/windows/) { 
    110     if($ENV{'PERLPATH'}) { 
    111         # need to ensure that the path to perl is quoted (in case there's spaces in it) 
     109    if($ENV{'PERLPATH'}) { 
     110    # need to ensure that the path to perl is quoted (in case there's spaces in it) 
     111    if($ENV{'GSDLOS'} =~ m/windows/) { 
    112112        $import_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S $import_cmd"; 
    113113    } else { 
    114         $import_cmd = "perl -S $import_cmd"; 
     114        $import_cmd = "\"$ENV{'PERLPATH'}/perl\" -S $import_cmd"; 
    115115    } 
     116    } else { 
     117    $import_cmd = "perl -S $import_cmd"; 
    116118    } 
     119 
    117120    if (-e $archiveinf_doc) { 
    118121    $import_cmd .= " -incremental"; 
  • gsdl/trunk/bin/script/incremental-rebuild.pl

    r20606 r20925  
    8585     
    8686    my $launch_cmd = ""; 
    87     if($ENV{'GSDLOS'} =~ m/windows/) { 
    88     if($ENV{'PERLPATH'}) { 
    89         # need to ensure that the path to perl is quoted (in case there's spaces in it) 
     87    if($ENV{'PERLPATH'}) { 
     88    # need to ensure that the path to perl is quoted (in case there's spaces in it) 
     89    if($ENV{'GSDLOS'} =~ m/windows/) { 
    9090        $launch_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S "; 
    9191    } else { 
    92         $launch_cmd = "perl -S "; 
     92        $launch_cmd = "\"$ENV{'PERLPATH'}/perl\" -S "; 
    9393    } 
     94    } else { 
     95    $launch_cmd = "perl -S "; 
    9496    } 
    9597