Changeset 24606 for main/trunk/greenstone2/bin/script/gs-magick.pl

Timestamp:

2011-09-16T15:29:47+12:00 (13 years ago)

Author:

ak19

Message:

Part of commit 24600: I didn't know env var GSDLARCH wasn't compulsory on Windows (where it isn't set by running setup.bat)

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'};
-    die "GSDLARCH not set - run (gs3-)setup script\n" unless defined $ENV{'GSDLARCH'};
-
+    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'};
     unshift (@INC, "$ENV{'GSDLHOME'}/perllib");
 }