Changeset 31750

Show
Ignore:
Timestamp:
26.06.2017 13:48:33 (5 months ago)
Author:
ak19
Message:

gsdlCGI needs to return the JRE_HOME path to java is JRE_HOME is set rather than JAVA_HOME

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm

    r30626 r31750  
    747747    } 
    748748 
     749    elsif (defined $ENV{'JRE_HOME'}) { 
     750    my $jre_home = $ENV{'JRE_HOME'}; 
     751    $jre_home =~ s/\/$//;  # Remove trailing slash if present (Unix specific) 
     752    return &FileUtils::filenameConcatenate($jre_home, "bin", "java"); 
     753    } 
     754 
    749755    # Hope that Java is on the PATH 
    750756    return "java";