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

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

@@ -47 +47 @@
     die "GSDLHOME not set\n" unless defined $ENV{'GSDLHOME'};
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
-
-    if(!$ENV{'PERLPATH'}) {
-    use Config; # for some reason, this can't be a require statement
-    my $full_perl_exec = $Config{perlpath}; #$^X;   
-    require File::Basename;
-    my $perl_path = File::Basename::dirname($full_perl_exec);
-    $ENV{'PERLPATH'} = $perl_path;
-    }
-
 }
 
@@ -63 +54 @@
 use util;
 use Cwd;
-#use Config; # for getting the perlpath in the recommended way
-# Note: even though this (and other) use statement comes after its
-# usage in BEGIN, the use statement is in fact executed before BEGIN.
-# Doesn't work here for Greenstone 3.
-
 
 # Are we running on WinNT or Win2000 (or later)?
@@ -419 +405 @@
     # formulate the command
     my $cmd = "";
-    my $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    my $full_perl_path = &util::get_perl_exec();
     $cmd .= "\"$full_perl_path\" -S ppttohtml.pl ";
     $cmd .= " \"$input_filename\" \"$output_filestem.html\"";
@@ -453 +439 @@
     # formulate the command
     my $cmd = "";
-    my $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    my $full_perl_path = &util::get_perl_exec();
     $cmd .= "\"$full_perl_path\" -S xlstohtml.pl ";
     $cmd .= " \"$input_filename\" \"$output_filestem.html\"";
@@ -1014 +1000 @@
     my $cmd = "";
     if ($timeout) {$cmd = "ulimit -t $timeout;";}
-    my $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    my $full_perl_path = &util::get_perl_exec();
     $cmd .= "\"$full_perl_path\" -S pdftohtml.pl -zoom $pdf_zoom";
     $cmd .= " -c" if ($pdf_complex);
@@ -1089 +1075 @@
     if ($timeout) {$cmd = "ulimit -t $timeout;";}
     $output_type =~ s/.*\_(.*)/$1/i;
-    my $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    my $full_perl_path = &util::get_perl_exec();
     $cmd .= "\"$full_perl_path\" -S pdfpstoimg.pl -convert_to $output_type \"$input_filename\" \"$output_filestem\"";
     if ($ENV{'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000) {