Changeset 27715

Timestamp:

2013-06-27T16:55:49+12:00 (11 years ago)

Author:

sjm84

Message:

Fixed some potential perl path errors

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/build/GS2PerlConstructor.java

@@ -150 +150 @@
         sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection construction: import collection."));
         Vector<String> command = new Vector<String>();
-        command.add(GlobalProperties.getProperty("perl.path", "perl") + "perl");
+
+        String perlPath = GlobalProperties.getProperty("perl.path", "perl");
+        if (perlPath.charAt(perlPath.length() - 1) != File.separatorChar)
+        {
+            perlPath = perlPath + File.separator;
+        }
+
+        command.add(perlPath + "perl");
         command.add("-S");
         command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "import.pl");
@@ -179 +186 @@
         sendMessage(new ConstructionEvent(this, GSStatus.INFO, "Collection construction: build collection."));
         Vector<String> command = new Vector<String>();
-        command.add(GlobalProperties.getProperty("perl.path", "perl") + "perl");
+
+        String perlPath = GlobalProperties.getProperty("perl.path", "perl");
+        if (perlPath.charAt(perlPath.length() - 1) != File.separatorChar)
+        {
+            perlPath = perlPath + File.separator;
+        }
+
+        command.add(perlPath + "perl");
         command.add("-S");
         command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "buildcol.pl");
@@ -242 +256 @@
         // sucessfully consistently during testing, whereas java at times is unable to delete it.
         Vector<String> command = new Vector<String>();
-        command.add(GlobalProperties.getProperty("perl.path", "perl") + "perl");
+
+        String perlPath = GlobalProperties.getProperty("perl.path", "perl");
+        if (perlPath.charAt(perlPath.length() - 1) != File.separatorChar)
+        {
+            perlPath = perlPath + File.separator;
+        }
+
+        command.add(perlPath + "perl");
         command.add("-S");
         command.add(GlobalProperties.getGS2Build() + File.separator + "bin" + File.separator + "script" + File.separator + "activate.pl");