Changeset 20924 for gli/trunk/src/org/greenstone/gatherer/collection/ScriptOptions.java

Timestamp:

2009-11-10T20:49:48+13:00 (14 years ago)

Author:

oranfry

Message:

Since we can now have a Perl installation inside Greenstone on linux as well, GLI code for Linux also launches perl with the -S flag.

File:

• gli/trunk/src/org/greenstone/gatherer/collection/ScriptOptions.java (modified) (1 diff)

gli/trunk/src/org/greenstone/gatherer/collection/ScriptOptions.java

@@ -230 +230 @@
         else {
         String args[];
-        if(Utility.isWindows()) {
-            args = new String[6];
-            args[0] = Configuration.perl_path;
-            args[1] = "-S";
-            args[2] = LocalGreenstone.getBinScriptDirectoryPath() + filename;
-            args[3] = "-xml";
-            args[4] = "-language";
-            args[5] = lang;
-        }
-        else {
-            args = new String[4];
-            args[0] = LocalGreenstone.getBinScriptDirectoryPath() + filename;
-            args[1] = "-xml";
-            args[2] = "-language";
-            args[3] = lang;
-        }
+        args = new String[6];
+        args[0] = Configuration.perl_path;
+        args[1] = "-S";
+        args[2] = LocalGreenstone.getBinScriptDirectoryPath() + filename;
+        args[3] = "-xml";
+        args[4] = "-language";
+        args[5] = lang;