Changeset 24362 for main/trunk/greenstone2/bin/script/incremental-rebuild.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-rebuild.pl (modified) (2 diffs)

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

@@ -39 +39 @@
 }
 
-
 use strict;
-
-use Config; # for getting the perlpath in the recommended way
 use util;
 
@@ -85 +82 @@
     my $final_status = 0;
     
-    my $launch_cmd = "";
-    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/) {
-        $launch_cmd = "\"$ENV{'PERLPATH'}\\Perl.exe\" -S ";
-    } else {
-        $launch_cmd = "\"$ENV{'PERLPATH'}/perl\" -S ";
-    }
-    } else {
-    #Config{perlpath}, like $^X, is a special variable containing the full path to the current perl executable we are in
-    $launch_cmd = "\"$Config{perlpath}\" -S ";
-    }
+    my $launch_cmd = "\"".&util::get_perl_exec()."\" -S ";    
 
     print STDERR "\n";