Changeset 25533

Timestamp:

2012-05-07T14:50:48+12:00 (12 years ago)

Author:

ak19

Message:

Need to ensure there are quotes around the path to the java command returned by the new get_java_command() subroutine, in case there are any spaces in this path.

File:

• main/trunk/greenstone2/perllib/util.pm (modified) (2 diffs)

main/trunk/greenstone2/perllib/util.pm

@@ -1715 +1715 @@
 }
 
+# returns the path to the java command in the JRE included with GS (if any),
+# quoted to safeguard any spaces in this path, otherwise a simple java
+# command is returned which assumes and will try for a system java.
 sub get_java_command {
     my $java = "java";
@@ -1722 +1725 @@
     if(-d $java_bin) {
         $java = &util::filename_cat($java_bin,"java");
+        $java = "\"".$java."\""; # quoted to preserve spaces in path
     }
     }