Changeset 24093 for main/trunk/greenstone2/bin/script/gti.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/gti.pl (modified) (3 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'}) {
+    my $full_perl_exec = $^X;
+    require File::Basename;
+    my $perl_path = File::Basename::dirname($full_perl_exec);
+    $ENV{'PERLPATH'} = $perl_path;
+    }
+}
 
 use iso639;
@@ -638 +644 @@
 
     my $target_filepath = &util::filename_cat($gsdl_root_directory, $target_file);
-    my $cmd = "/opt/jdk1.6.0/bin/java -cp $classpath:$classpath/xalan.jar ApplyXSLT $target_language_code $gen_many_html_xsl_filepath $target_filepath | perl -S $split_script_filepath $target_file_directory";
+    my $perl_exec = &util::filename_cat($ENV{'PERLPATH'}, "perl");
+    my $java_exec = "java";
+    if(defined($ENV{'JAVA_HOME'}) && $ENV{'JAVA_HOME'} ne ""){
+    $java_exec = &util::filename_cat($ENV{'JAVA_HOME'}, "bin", "java");
+    }
+
+    my $cmd = "$java_exec -cp $classpath:$classpath/xalan.jar ApplyXSLT $target_language_code $gen_many_html_xsl_filepath $target_filepath | $perl_exec -S $split_script_filepath $target_file_directory";
     my $response = `$cmd`;
     &log_message($cmd);
@@ -644 +656 @@
     &log_message("Created HTML operational files");
     
-    $cmd = "/opt/jdk1.6.0/bin/java -cp $classpath:$classpath/xalan.jar ApplyXSLT $target_language_code $gen_index_xml_xsl_filepath $target_filepath > " . $target_file_directory . "help_index.xml"; # 2>/dev/null";
+    $cmd = "$java_exec -cp $classpath:$classpath/xalan.jar ApplyXSLT $target_language_code $gen_index_xml_xsl_filepath $target_filepath > " . $target_file_directory . "help_index.xml"; # 2>/dev/null";
     $response = `$cmd`;
     &log_message($cmd);