Changeset 24125

Timestamp:

2011-06-08T16:24:39+12:00 (12 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:

• build (modified) (4 diffs)
• full-buildcol.pl (modified) (1 diff)
• full-import.pl (modified) (1 diff)
• full-rebuild.pl (modified) (1 diff)
• gti.pl (modified) (1 diff)
• incremental-buildcol.pl (modified) (1 diff)
• incremental-import-onlyadd.pl (modified) (1 diff)
• incremental-import.pl (modified) (1 diff)
• incremental-rebuild.pl (modified) (1 diff)
• mirror.pl (modified) (2 diffs)

main/trunk/greenstone2/bin/script/build

@@ -277 +277 @@
 
         #$^X is a special variable containing the full path to the current perl executable we are in
-        my $download_cmd = "$^X -S gsWget.pl -P \"$importdir\" -np -nv";
+        my $download_cmd = "\"$^X\" -S gsWget.pl -P \"$importdir\" -np -nv";
         $download_cmd .= " -r -N -l inf -R \"*\\?*\"";
         $download_cmd .= " -o \"$outfile.download\"" if $use_out;
@@ -327 +327 @@
             # copy download_dir and all it contains to the import directory
             #$^X is a special variable containing the full path to the current perl executable we are in
-            my $download_cmd = "$^X -S filecopy.pl";
+            my $download_cmd = "\"$^X\" -S filecopy.pl";
             $download_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
             $download_cmd .= " -site \"$site\"" if $site =~ /\w/;
@@ -467 +467 @@
 
     #$^X is a special variable containing the full path to the current perl executable we are in
-    my $import_cmd = "$^X -S import.pl";
+    my $import_cmd = "\"$^X\" -S import.pl";
     $import_cmd .= " -out \"$outfile.import\"" if $use_out;
     if ($append) {
@@ -514 +514 @@
 
     #$^X is a special variable containing the full path to the current perl executable we are in
-    my $build_cmd = "$^X -S buildcol.pl";
+    my $build_cmd = "\"$^X\" -S buildcol.pl";
 
     my $removeold = 1;

main/trunk/greenstone2/bin/script/full-buildcol.pl

@@ -49 +49 @@
 } else {
     #$^X is a special variable containing the full path to the current perl executable we are in
-    $buildcol_cmd = "$^X -S $buildcol_cmd";
+    $buildcol_cmd = "\"$^X\" -S $buildcol_cmd";
 }
 

main/trunk/greenstone2/bin/script/full-import.pl

@@ -49 +49 @@
 } else {
     #$^X is a special variable containing the full path to the current perl executable we are in
-    $import_cmd = "$^X -S $import_cmd";
+    $import_cmd = "\"$^X\" -S $import_cmd";
 }
 

main/trunk/greenstone2/bin/script/full-rebuild.pl

@@ -113 +113 @@
     } else {
     #$^X is a special variable containing the full path to the current perl executable we are in
-    $launch_cmd = "$^X -S ";
+    $launch_cmd = "\"$^X\" -S ";
     }
     

main/trunk/greenstone2/bin/script/gti.pl

@@ -650 +650 @@
     }
 
-    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";
+    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";
     my $response = `$cmd`;
     &log_message($cmd);

main/trunk/greenstone2/bin/script/incremental-buildcol.pl

@@ -112 +112 @@
     } else {
     #$^X is a special variable containing the full path to the current perl executable we are in
-    $buildcol_cmd = "$^X -S $buildcol_cmd";
+    $buildcol_cmd = "\"$^X\" -S $buildcol_cmd";
     }
 

main/trunk/greenstone2/bin/script/incremental-import-onlyadd.pl

@@ -119 +119 @@
     } else {
     #$^X is a special variable containing the full path to the current perl executable we are in
-    $import_cmd = "$^X -S $import_cmd";
+    $import_cmd = "\"$^X\" -S $import_cmd";
     }
 

main/trunk/greenstone2/bin/script/incremental-import.pl

@@ -139 +139 @@
     } else {
     #$^X is a special variable containing the full path to the current perl executable we are in
-    $import_cmd = "$^X -S $import_cmd";
+    $import_cmd = "\"$^X\" -S $import_cmd";
     }
 

main/trunk/greenstone2/bin/script/incremental-rebuild.pl

@@ -94 +94 @@
     } else {
     #$^X is a special variable containing the full path to the current perl executable we are in
-    $launch_cmd = "$^X -S ";
+    $launch_cmd = "\"$^X\" -S ";
     }
 

main/trunk/greenstone2/bin/script/mirror.pl

@@ -117 +117 @@
     my  $cmd = "cd $importdir; ";
     #$^X is a special variable containing the full path to the current perl executable we are in
-    $cmd .= "$^X -S gsw3mir.pl -cfgfile $etcdir/w3mir.cfg";
+    $cmd .= "\"$^X\" -S gsw3mir.pl -cfgfile $etcdir/w3mir.cfg";
     # print "\n$cmd\n";
     `$cmd`;
@@ -127 +127 @@
     elsif ((-e "$etcdir/wget.cfg") && (-e "$etcdir/wget.url")) {
     $ENV{WGETRC} = "$etcdir/wget.cfg";
-    my $cmd = "$^X -S gsWget.pl --input-file=$etcdir/wget.url --directory-prefix=$importdir";
+    my $cmd = "\"$^X\" -S gsWget.pl --input-file=$etcdir/wget.url --directory-prefix=$importdir";
     system($cmd);
     }