Changeset 24093 for main/trunk/greenstone2/bin/script/gsConvert.pl

Timestamp:

2011-05-26T14:45:49+12:00 (13 years ago)

Author:

sjm84

Message:

Fixing issues with perl finding the wrong perl by making sure it uses the one that is currently running

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'}) {
+    my $full_perl_exec = $^X;
+    require File::Basename;
+    my $perl_path = File::Basename::dirname($full_perl_exec);
+    $ENV{'PERLPATH'} = $perl_path;
+    }
+
 }
 
@@ -54 +62 @@
 use util;
 use Cwd;
-use File::Basename;
 
 # Are we running on WinNT or Win2000 (or later)?
@@ -406 +413 @@
     # formulate the command
     my $cmd = "";
-    $cmd .= "perl -S ppttohtml.pl ";
+    $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    $cmd .= "$full_perl_path -S ppttohtml.pl ";
     $cmd .= " \"$input_filename\" \"$output_filestem.html\"";
     $cmd .= " 2>\"$output_filestem.err\""
@@ -439 +447 @@
     # formulate the command
     my $cmd = "";
-    $cmd .= "perl -S xlstohtml.pl ";
+    $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    $cmd .= "$full_perl_perl -S xlstohtml.pl ";
     $cmd .= " \"$input_filename\" \"$output_filestem.html\"";
     $cmd .= " 2>\"$output_filestem.err\""
@@ -977 +986 @@
     my $cmd = "";
     if ($timeout) {$cmd = "ulimit -t $timeout;";}
-    $cmd .= "perl -S pdftohtml.pl -zoom $pdf_zoom";
+    $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    $cmd .= "$full_perl_path -S pdftohtml.pl -zoom $pdf_zoom";
     $cmd .= " -c" if ($pdf_complex);
     $cmd .= " -i" if ($pdf_ignore_images);
@@ -1051 +1061 @@
     if ($timeout) {$cmd = "ulimit -t $timeout;";}
     $output_type =~ s/.*\_(.*)/$1/i;
-    $cmd .= "perl -S pdfpstoimg.pl -convert_to $output_type \"$input_filename\" \"$output_filestem\"";
+    $full_perl_path = &util::filename_cat($ENV{'PERLPATH'},"perl");
+    $cmd .= "$full_perl_perl -S pdfpstoimg.pl -convert_to $output_type \"$input_filename\" \"$output_filestem\"";
     if ($ENV{'GSDLOS'} !~ m/^windows$/i || $is_winnt_2000) {
     $cmd .= " > \"$output_filestem.out\" 2> \"$output_filestem.err\"";