erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 00:17:11 -07:00
Code Releases Activity

Added support for jvm parameters (-Dkey=value)

Browse source
This commit is contained in:
Erik C. Thauvin 2016-07-20 22:36:45 -07:00
parent 67ab53f8a3
commit 2d6c8f720c
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
View file

@ -78,7 +78,7 @@ public class Main {
if (! exit) { if (! exit) {
Path kobaltJarFile = installDistribution(); Path kobaltJarFile = installDistribution();
if (!noLaunch) { if (!noLaunch) {
result = launchMain(kobaltJarFile, kobaltArgv.toArray(new String[kobaltArgv.size()])); result = launchMain(kobaltJarFile, kobaltArgv);
} }
} }
return result; return result;
@ -477,13 +477,22 @@ public class Main {
System.out.println("[Wrapper error] *** " + s); System.out.println("[Wrapper error] *** " + s);
} }
private int launchMain(Path kobaltJarFile, String[] argv) throws IOException, InterruptedException { private int launchMain(Path kobaltJarFile, List<String> argv) throws IOException, InterruptedException {
List<String> args = new ArrayList<>(); List<String> args = new ArrayList<>();
args.add("java"); args.add("java");
args.add("-Dfile.encoding=" + Charset.defaultCharset().name()); args.add("-Dfile.encoding=" + Charset.defaultCharset().name());
// jvm parameters must go before -jar
Iterator<String> i = argv.iterator();
while (i.hasNext()) {
String arg = i.next();
if (arg.matches("-D(.+?)=(.*)")) {
args.add(arg);
i.remove();
}
}
args.add("-jar"); args.add("-jar");
args.add(kobaltJarFile.toFile().getAbsolutePath()); args.add(kobaltJarFile.toFile().getAbsolutePath());
Collections.addAll(args, argv); Collections.addAll(args, argv.toArray(new String[argv.size()]));
ProcessBuilder pb = new ProcessBuilder(args); ProcessBuilder pb = new ProcessBuilder(args);
pb.inheritIO(); pb.inheritIO();