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

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/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 {
@@ -276 +277 @@
         #       option was given to build)
 
-        #$^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";
+        #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";
         $download_cmd .= " -r -N -l inf -R \"*\\?*\"";
         $download_cmd .= " -o \"$outfile.download\"" if $use_out;
@@ -326 +327 @@
         if (-e $download_dir) {
             # 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";
+            #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";
             $download_cmd .= " -collectdir \"$collectdir\"" if $collectdir =~ /\w/;
             $download_cmd .= " -site \"$site\"" if $site =~ /\w/;
@@ -466 +467 @@
     print $out "importing the $collection collection\n\n";
 
-    #$^X is a special variable containing the full path to the current perl executable we are in
-    my $import_cmd = "\"$^X\" -S import.pl";
+    #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";
     $import_cmd .= " -out \"$outfile.import\"" if $use_out;
     if ($append) {
@@ -513 +514 @@
     print $out "building the $collection collection\n\n";
 
-    #$^X is a special variable containing the full path to the current perl executable we are in
-    my $build_cmd = "\"$^X\" -S buildcol.pl";
+    #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 $removeold = 1;