Changeset 31747

Timestamp:

2017-06-26T11:16:39+12:00 (6 years ago)

Author:

ak19

Message:

When we settle on a JRE (which could be the bundled JRE), only JRE_HOME is now exported. That should be the path to the java executable that is found. Need to rethink whether we export JAVA_HOME too as JRE_HOME in future if we settle on a JRE, just to work with our code where JAVA_HOME is expected.

File:

• main/trunk/greenstone2/bin/script/lucene_query.pl (modified) (1 diff)

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

@@ -47 +47 @@
     $java_home =~ s/\/$//;  # Remove trailing slash if present (Unix specific)
     return &util::filename_cat($java_home, "bin", "java");
+    }
+    elsif (defined $ENV{'JRE_HOME'}) {
+    my $jre_home = $ENV{'JRE_HOME'};
+    $jre_home =~ s/\/$//;  # Remove trailing slash if present (Unix specific)
+    return &util::filename_cat($jre_home, "bin", "java");
     }