Changeset 31756


Ignore:
Timestamp:
2017-06-26T17:16:08+12:00 (5 years ago)
Author:
ak19
Message:

For gs-fedora scripts, check for JRE_HOME as fallback if JAVA_HOME is not set

Location:
main/trunk/greenstone2/bin/script
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/bin/script/g2f-buildcol.pl

    r26418 r31756  
    99    }
    1010
    11     if (!defined $ENV{'JAVA_HOME'}) {
    12     print STDERR "Environment variable JAVA_HOME not set.\n";
     11    if (!defined $ENV{'JAVA_HOME'} && !defined $ENV{'JRE_HOME'}) {
     12    print STDERR "Neither JAVA_HOME nor JRE_HOME set.\n";
    1313    print STDERR "Needed by Fedora command line scripts.\n";
    1414    exit 1;
  • main/trunk/greenstone2/bin/script/g2f-deletecol.pl

    r26419 r31756  
    99    }
    1010
    11     if (!defined $ENV{'JAVA_HOME'}) {
    12     print STDERR "Environment variable JAVA_HOME not set.\n";
    13     print STDERR "Needed by Fedora command line scripts.\n";
     11    if (!defined $ENV{'JAVA_HOME'} && !defined $ENV{'JRE_HOME'}) {
     12    print STDERR "Neither JAVA_HOME nor JRE_HOME set.\n";
     13    print STDERR "Java needed by Fedora command line scripts.\n";
    1414    exit 1;
    1515    }
Note: See TracChangeset for help on using the changeset viewer.