git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ce3378f
)
discover java home path
author
Jim Procter
<jprocter@issues.jalview.org>
Mon, 17 Sep 2018 10:39:00 +0000
(11:39 +0100)
committer
Jim Procter
<jprocter@issues.jalview.org>
Mon, 17 Sep 2018 10:39:00 +0000
(11:39 +0100)
src/jalview/util/Worker.java
patch
|
blob
|
history
diff --git
a/src/jalview/util/Worker.java
b/src/jalview/util/Worker.java
index
68f4174
..
ff7f0a9
100644
(file)
--- a/
src/jalview/util/Worker.java
+++ b/
src/jalview/util/Worker.java
@@
-1,6
+1,7
@@
package jalview.util;
import java.io.BufferedReader;
package jalview.util;
import java.io.BufferedReader;
+import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintStream;
@@
-119,7
+120,10
@@
public class Worker extends Thread
// Note: JAL-3065 - don't include quotes for lib/* because the arguments are
// not expanded by the shell
String classpath = getClassPath();
// Note: JAL-3065 - don't include quotes for lib/* because the arguments are
// not expanded by the shell
String classpath = getClassPath();
- String _cmd = "java " + (withAwt ? "-Djava.awt.headless=true" : "")
+ String javahome = System.getProperty("java.home");
+
+ String _cmd = javahome + File.pathSeparator + "java "
+ + (withAwt ? "-Djava.awt.headless=true" : "")
+ " -classpath " + classpath + " " + javaArgs
+ " jalview.bin.Jalview ";
Process ls2_proc = null;
+ " -classpath " + classpath + " " + javaArgs
+ " jalview.bin.Jalview ";
Process ls2_proc = null;