Changeset 24785 for main/trunk

Timestamp:

2011-10-20T19:45:09+13:00 (13 years ago)

Author:

ak19

Message:

GSDLARCH is only set on some Linux systems. Not set on the CentOS here, for example. So the code can't die if this is not set.

File:

• main/trunk/greenstone2/bin/script/gs-magick.pl (modified) (1 diff)

main/trunk/greenstone2/bin/script/gs-magick.pl

@@ -37 +37 @@
     die "GSDLHOME not set - run the (gs3-)setup script\n" unless defined $ENV{'GSDLHOME'};
     die "GSDLOS not set - run (gs3-)setup script\n" unless defined $ENV{'GSDLOS'};
-    if($ENV{'GSDLOS'} =~ m/windows/) { # windows doesn't (yet) define GSDLARCH env var
-        $ENV{'GSDLARCH'} = "" unless defined $ENV{'GSDLARCH'};
-    }
-    die "GSDLARCH not set - run (gs3-)setup script\n" unless defined $ENV{'GSDLARCH'};
+    $ENV{'GSDLARCH'} = "" unless defined $ENV{'GSDLARCH'}; # GSDLARCH will be set only on some Linux systems
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
 }