Changeset 24192 for main/trunk/greenstone2/perllib/cgiactions/indexaction.pm

Timestamp:

2011-06-22T17:39:13+12:00 (13 years ago)

Author:

ak19

Message:

Sam discovered that using dollar-Config{perlpath} in place of dollar-hat-X is the better way to obtain the path to the perl that is being used. We hope this will not be a relative path on the Mac as dollar-hat-x was on Professor Witten's Mac when we tried it there today.

File:

• main/trunk/greenstone2/perllib/cgiactions/indexaction.pm (modified) (7 diffs)

main/trunk/greenstone2/perllib/cgiactions/indexaction.pm

@@ -31 +31 @@
 
 use cgiactions::baseaction;
-
+use Config; # for getting the perlpath in the recommended way
 
 
@@ -133 +133 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$^X\" -S full-import.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S full-import.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -172 +172 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$^X\" -S full-buildcol.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S full-buildcol.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -211 +211 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$^X\" -S full-rebuild.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S full-rebuild.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -251 +251 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$^X\" -S incremental-import.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S incremental-import.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -292 +292 @@
 
     my $bin_script = &util::filename_cat($gsdl_home,"bin","script");
-    my $cmd = "\"$^X\" -S incremental-buildcol.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S incremental-buildcol.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);
@@ -329 +329 @@
     $self->lock_collection($username, $collect);
 
-    my $cmd = "\"$^X\" -S incremental-rebuild.pl \"$collect\"";
+    my $cmd = "\"$Config{perlpath}\" -S incremental-rebuild.pl \"$collect\"";
 
     my ($status,$report) = $self->run_build_cmd($cmd);