Changeset 31750 for main/trunk/greenstone2/common-src

Timestamp:

2017-06-26T13:48:33+12:00 (7 years ago)

Author:

ak19

Message:

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

File:

• main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm (modified) (1 diff)

main/trunk/greenstone2/common-src/cgi-bin/gsdlCGI.pm

@@ -747 +747 @@
     }
 
+    elsif (defined $ENV{'JRE_HOME'}) {
+    my $jre_home = $ENV{'JRE_HOME'};
+    $jre_home =~ s/\/$//;  # Remove trailing slash if present (Unix specific)
+    return &FileUtils::filenameConcatenate($jre_home, "bin", "java");
+    }
+
     # Hope that Java is on the PATH
     return "java";