Changeset 24238

Timestamp:

2011-07-06T15:32:04+12:00 (12 years ago)

Author:

sjm84

Message:

Fixed a few problems with Tomcat auto-starting when GLI starts on Linux

File:

• main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -1575 +1575 @@
             {
                 String shellCommand = null;
+                Process p = null;
                 if (Utility.isWindows())
                 {
-                    shellCommand = "cmd /C";
+                    p = Runtime.getRuntime().exec("cmd /C \"cd " + _gsdl_path + File.separator + ".. && ant start\"\"");    
                 }
                 else
                 {
-                    shellCommand = "bash -c";
-                }
-                
-                Process p = Runtime.getRuntime().exec(shellCommand + " \"cd " + _gsdl_path + File.separator + ".. && ant start\"");
+                    p = Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "ant restart -f \"" + _gsdl_path + ".." + File.separator + "build.xml\""});
+                }
             }
             catch(Exception ex)