Changeset 35705 for main/trunk

Timestamp:

2021-10-25T19:30:53+13:00 (2 years ago)

Author:

davidb

Message:

Changed to make things clearer that not setting JAVA_HOME but having 'java' on your PATH is an acceptable setup

Location:

main/trunk/greenstone2/bin/script

Files:

• gti.pl (modified) (1 diff)
• lucene_query.pl (modified) (1 diff)

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

@@ -806 +806 @@
     }
 
-    my $perl_exec = &util::get_perl_exec();
-    my $java_exec = "java";
-    if(defined($ENV{'JAVA_HOME'}) && $ENV{'JAVA_HOME'} ne ""){
-        $java_exec = &util::filename_cat($ENV{'JAVA_HOME'}, "bin", "java");
-    } elsif(defined($ENV{'JRE_HOME'}) && $ENV{'JRE_HOME'} ne ""){
-        $java_exec = &util::filename_cat($ENV{'JRE_HOME'}, "bin", "java");
-    }
+    my $perl_exec = &util::get_perl_exec();
+
+    my $java_exec = undef;
+    if (defined($ENV{'JAVA_HOME'}) && $ENV{'JAVA_HOME'} ne "") {
+    $java_exec = &util::filename_cat($ENV{'JAVA_HOME'}, "bin", "java");
+    }
+    elsif (defined($ENV{'JRE_HOME'}) && $ENV{'JRE_HOME'} ne "") {
+    $java_exec = &util::filename_cat($ENV{'JRE_HOME'}, "bin", "java");
+    }
+    else {
+    # Assume it is on the user's PATH
+    $java_exec = "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";

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

@@ -54 +54 @@
     }
 
-    # Hope that Java is on the PATH
+    # Assume that Java is on the user's PATH
     return "java";
 }