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

main/trunk/greenstone2/bin/script/gti.pl

@@ -31 +31 @@
     die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
-
-    if(!$ENV{'PERLPATH'}) {
-    use Config; # for getting the perlpath in the recommended way
-    my $full_perl_exec = $Config{perlpath}; #$^X;
-    require File::Basename;
-    my $perl_path = File::Basename::dirname($full_perl_exec);
-    $ENV{'PERLPATH'} = $perl_path;
-    }
 }
 
@@ -645 +637 @@
 
     my $target_filepath = &util::filename_cat($gsdl_root_directory, $target_file);
-    my $perl_exec = &util::filename_cat($ENV{'PERLPATH'}, "perl");
+    my $perl_exec = &util::get_perl_exec();
     my $java_exec = "java";
     if(defined($ENV{'JAVA_HOME'}) && $ENV{'JAVA_HOME'} ne ""){