Changeset 31747

Show
Ignore:
Timestamp:
26.06.2017 11:16:39 (5 weeks 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/lucene_query.pl

    r29144 r31747  
    4747    $java_home =~ s/\/$//;  # Remove trailing slash if present (Unix specific) 
    4848    return &util::filename_cat($java_home, "bin", "java"); 
     49    } 
     50    elsif (defined $ENV{'JRE_HOME'}) { 
     51    my $jre_home = $ENV{'JRE_HOME'}; 
     52    $jre_home =~ s/\/$//;  # Remove trailing slash if present (Unix specific) 
     53    return &util::filename_cat($jre_home, "bin", "java"); 
    4954    } 
    5055