Changeset 24362 for main/trunk/greenstone2/bin/script/build

Timestamp:

2011-08-03T21:17:30+12:00 (13 years ago)

Author:

ak19

Message:

The method of locating perl has changed once more: util now defines the fuction get_perl_exec which is used by other scripts to obtain the path to the perl executable they should use.

File:

• main/trunk/greenstone2/bin/script/build (modified) (5 diffs)

main/trunk/greenstone2/bin/script/build

@@ -43 +43 @@
 use FileHandle;
 use File::Copy;
-use Config; # for getting the perlpath in the recommended way
 
 BEGIN {
@@ -277 +276 @@
         #       option was given to build)
 
-        #Config{perlpath}, like $^X, is a special variable containing the full path to the current perl executable we are in
-        my $download_cmd = "\"$Config{perlpath}\" -S gsWget.pl -P \"$importdir\" -np -nv";
+        my $download_cmd = "\"".&util::get_perl_exec()."\" -S gsWget.pl -P \"$importdir\" -np -nv";
         $download_cmd .= " -r -N -l inf -R \"*\\?*\"";
         $download_cmd .= " -o \"$outfile.download\"" if $use_out;
@@ -328 +326 @@
             # copy download_dir and all it contains to the import directory
             #Config{perlpath}, like $^X, is a special variable containing the full path to the current perl executable we are in
-            my $download_cmd = "\"$Config{perlpath}\" -S filecopy.pl";
+            my $download_cmd = "\"".&util::get_perl_exec()."\" -S filecopy.pl";
             $download_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
             $download_cmd .= " -site \"$site\"" if $site =~ /\w/;
@@ -468 +466 @@
 
     #Config{perlpath}, like $^X, is a special variable containing the full path to the current perl executable we are in
-    my $import_cmd = "\"$Config{perlpath}\" -S import.pl";
+    my $import_cmd = "\"".&util::get_perl_exec()."\" -S import.pl";
     $import_cmd .= " -out \"$outfile.import\"" if $use_out;
     if ($append) {
@@ -515 +513 @@
 
     #Config{perlpath}, like $^X, is a special variable containing the full path to the current perl executable we are in
-    my $build_cmd = "\"$Config{perlpath}\" -S buildcol.pl";
+    my $build_cmd = "\"".&util::get_perl_exec()."\" -S buildcol.pl";
 
     my $removeold = 1;