Changeset 16376

Timestamp:

2008-07-14T14:27:24+12:00 (15 years ago)

Author:

ak19

Message:

Outputs FEDORA_HOME env vars if any are set

File:

• greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl (modified) (2 diffs)

greenstone3/trunk/web/WEB-INF/cgi/gliserver.pl

@@ -141 +141 @@
     }
     elsif ($cmd eq "upload-collection-file") {
-    #print STDERR "CMD upload_collection_file\nusername: $username, site: $site, ts: $timestamp\n";
     &upload_collection_file($gsdl_cgi, $username, $timestamp, $site);
     }
@@ -375 +374 @@
     $installation_status .= "JAVA_HOME: " . $ENV{'JAVA_HOME'} . "\n" if defined($ENV{'JAVA_HOME'}); # on GS2, Java's only on the PATH
     $installation_status .= "PATH: " . $ENV{'PATH'} . "\n";
+    $installation_status .= "FEDORA_HOME: ".$ENV{'FEDORA_HOME'} if defined($ENV{'FEDORA_HOME'});
     
+    if (defined $ENV{'FEDORA2_HOME'}) {
+    $installation_status .= "\nFEDORA2_HOME: ".$ENV{'FEDORA2_HOME'}."\n";
+    } elsif (defined $ENV{'FEDORA3_HOME'}) {
+    $installation_status .= "\nFEDORA3_HOME: ".$ENV{'FEDORA3_HOME'}."\n";
+    }
 
     if ($installation_ok) { ## M. Dewsnip's svn log comment stated that for iis6_mode output needs to go to STDOUT