Changeset 31756

Timestamp:

2017-06-26T17:16:08+12:00 (6 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:

• g2f-buildcol.pl (modified) (1 diff)
• g2f-deletecol.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/g2f-buildcol.pl

@@ -9 +9 @@
     }
 
-    if (!defined $ENV{'JAVA_HOME'}) {
-    print STDERR "Environment variable JAVA_HOME not set.\n";
+    if (!defined $ENV{'JAVA_HOME'} && !defined $ENV{'JRE_HOME'}) {
+    print STDERR "Neither JAVA_HOME nor JRE_HOME set.\n";
     print STDERR "Needed by Fedora command line scripts.\n";
     exit 1;

main/trunk/greenstone2/bin/script/g2f-deletecol.pl

@@ -9 +9 @@
     }
 
-    if (!defined $ENV{'JAVA_HOME'}) {
-    print STDERR "Environment variable JAVA_HOME not set.\n";
-    print STDERR "Needed by Fedora command line scripts.\n";
+    if (!defined $ENV{'JAVA_HOME'} && !defined $ENV{'JRE_HOME'}) {
+    print STDERR "Neither JAVA_HOME nor JRE_HOME set.\n";
+    print STDERR "Java needed by Fedora command line scripts.\n";
     exit 1;
     }