Changeset 24362 for main/trunk/greenstone2/bin/script/incremental-buildcol.pl

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/incremental-buildcol.pl (modified) (3 diffs)

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

@@ -42 +42 @@
 no strict 'subs'; # allow barewords (eg STDERR) as function arguments
 
-use Config; # for getting the perlpath in the recommended way
 use util;
 use colcfg;
@@ -92 +91 @@
     print STDERR "Unable to use collection \"$collection\" within \"$collect_dir\"\n";
     exit -1;
-    }   
-
+    }
 
     if (!defined $build_dir) {
@@ -103 +101 @@
     my $quoted_argv = join(" ", map { "\"$_\"" } @filtered_argv);
     
-    my $buildcol_cmd = "buildcol.pl";
-    if($ENV{'PERLPATH'}) {
-    # need to ensure that the path to perl is quoted (in case there's spaces in it)
-    if($ENV{'GSDLOS'} =~ m/windows/) {  
-        $buildcol_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S $buildcol_cmd";
-    } else {
-        $buildcol_cmd = "\"$ENV{'PERLPATH'}/perl\" -S $buildcol_cmd";
-    }
-    } else {
-    #Config{perlpath}, like $^X, is a special variable containing the full path to the current perl executable we are in
-    $buildcol_cmd = "\"$Config{perlpath}\" -S $buildcol_cmd";
-    }
+    my $buildcol_cmd = "\"".&util::get_perl_exec()."\" -S buildcol.pl";
 
     # Read in the collection configuration file.