Changeset 24125

Show
Ignore:
Timestamp:
08.06.2011 16:24:39 (8 years ago)
Author:
ak19
Message:

Sam and I fixed all calls to perl specifying a perlpath that was not embedded in quotes so that the perlpath is now nested in quotes (so that we don't have problems launching perl from within another perl script when there are spaces in the filepath).

Location:
main/trunk/greenstone2/bin/script
Files:
10 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/build

    r24093 r24125  
    277277 
    278278        #$^X is a special variable containing the full path to the current perl executable we are in 
    279         my $download_cmd = "$^X -S gsWget.pl -P \"$importdir\" -np -nv"; 
     279        my $download_cmd = "\"$^X\" -S gsWget.pl -P \"$importdir\" -np -nv"; 
    280280        $download_cmd .= " -r -N -l inf -R \"*\\?*\""; 
    281281        $download_cmd .= " -o \"$outfile.download\"" if $use_out; 
     
    327327            # copy download_dir and all it contains to the import directory 
    328328            #$^X is a special variable containing the full path to the current perl executable we are in 
    329             my $download_cmd = "$^X -S filecopy.pl"; 
     329            my $download_cmd = "\"$^X\" -S filecopy.pl"; 
    330330            $download_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/; 
    331331            $download_cmd .= " -site \"$site\"" if $site =~ /\w/; 
     
    467467 
    468468    #$^X is a special variable containing the full path to the current perl executable we are in 
    469     my $import_cmd = "$^X -S import.pl"; 
     469    my $import_cmd = "\"$^X\" -S import.pl"; 
    470470    $import_cmd .= " -out \"$outfile.import\"" if $use_out; 
    471471    if ($append) { 
     
    514514 
    515515    #$^X is a special variable containing the full path to the current perl executable we are in 
    516     my $build_cmd = "$^X -S buildcol.pl"; 
     516    my $build_cmd = "\"$^X\" -S buildcol.pl"; 
    517517 
    518518    my $removeold = 1; 
  • main/trunk/greenstone2/bin/script/full-buildcol.pl

    r24093 r24125  
    4949} else { 
    5050    #$^X is a special variable containing the full path to the current perl executable we are in 
    51     $buildcol_cmd = "$^X -S $buildcol_cmd"; 
     51    $buildcol_cmd = "\"$^X\" -S $buildcol_cmd"; 
    5252} 
    5353 
  • main/trunk/greenstone2/bin/script/full-import.pl

    r24093 r24125  
    4949} else { 
    5050    #$^X is a special variable containing the full path to the current perl executable we are in 
    51     $import_cmd = "$^X -S $import_cmd"; 
     51    $import_cmd = "\"$^X\" -S $import_cmd"; 
    5252} 
    5353 
  • main/trunk/greenstone2/bin/script/full-rebuild.pl

    r24093 r24125  
    113113    } else { 
    114114    #$^X is a special variable containing the full path to the current perl executable we are in 
    115     $launch_cmd = "$^X -S "; 
     115    $launch_cmd = "\"$^X\" -S "; 
    116116    } 
    117117     
  • main/trunk/greenstone2/bin/script/gti.pl

    r24093 r24125  
    650650    } 
    651651 
    652     my $cmd = "$java_exec -cp $classpath:$classpath/xalan.jar ApplyXSLT $target_language_code $gen_many_html_xsl_filepath $target_filepath | $perl_exec -S $split_script_filepath $target_file_directory"; 
     652    my $cmd = "$java_exec -cp $classpath:$classpath/xalan.jar ApplyXSLT $target_language_code $gen_many_html_xsl_filepath $target_filepath | \"$perl_exec\" -S $split_script_filepath $target_file_directory"; 
    653653    my $response = `$cmd`; 
    654654    &log_message($cmd); 
  • main/trunk/greenstone2/bin/script/incremental-buildcol.pl

    r24093 r24125  
    112112    } else { 
    113113    #$^X is a special variable containing the full path to the current perl executable we are in 
    114     $buildcol_cmd = "$^X -S $buildcol_cmd"; 
     114    $buildcol_cmd = "\"$^X\" -S $buildcol_cmd"; 
    115115    } 
    116116 
  • main/trunk/greenstone2/bin/script/incremental-import-onlyadd.pl

    r24093 r24125  
    119119    } else { 
    120120    #$^X is a special variable containing the full path to the current perl executable we are in 
    121     $import_cmd = "$^X -S $import_cmd"; 
     121    $import_cmd = "\"$^X\" -S $import_cmd"; 
    122122    } 
    123123 
  • main/trunk/greenstone2/bin/script/incremental-import.pl

    r24093 r24125  
    139139    } else { 
    140140    #$^X is a special variable containing the full path to the current perl executable we are in 
    141     $import_cmd = "$^X -S $import_cmd"; 
     141    $import_cmd = "\"$^X\" -S $import_cmd"; 
    142142    } 
    143143 
  • main/trunk/greenstone2/bin/script/incremental-rebuild.pl

    r24093 r24125  
    9494    } else { 
    9595    #$^X is a special variable containing the full path to the current perl executable we are in 
    96     $launch_cmd = "$^X -S "; 
     96    $launch_cmd = "\"$^X\" -S "; 
    9797    } 
    9898 
  • main/trunk/greenstone2/bin/script/mirror.pl

    r24093 r24125  
    117117    my  $cmd = "cd $importdir; "; 
    118118    #$^X is a special variable containing the full path to the current perl executable we are in 
    119     $cmd .= "$^X -S gsw3mir.pl -cfgfile $etcdir/w3mir.cfg"; 
     119    $cmd .= "\"$^X\" -S gsw3mir.pl -cfgfile $etcdir/w3mir.cfg"; 
    120120    # print "\n$cmd\n"; 
    121121    `$cmd`; 
     
    127127    elsif ((-e "$etcdir/wget.cfg") && (-e "$etcdir/wget.url")) { 
    128128    $ENV{WGETRC} = "$etcdir/wget.cfg"; 
    129     my $cmd = "$^X -S gsWget.pl --input-file=$etcdir/wget.url --directory-prefix=$importdir"; 
     129    my $cmd = "\"$^X\" -S gsWget.pl --input-file=$etcdir/wget.url --directory-prefix=$importdir"; 
    130130    system($cmd); 
    131131    }