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

Merge pull request #290 from ethauvin/master

Browse source 
Added support for jvm parameters (-Dkey=value)
This commit is contained in:
Cedric Beust 2016-07-20 22:44:42 -07:00 • committed by GitHub
commit 6b32aa6e62
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) {
Path kobaltJarFile = installDistribution();
if (!noLaunch) {
result = launchMain(kobaltJarFile, kobaltArgv.toArray(new String[kobaltArgv.size()]));
result = launchMain(kobaltJarFile, kobaltArgv);
}
}
return result;
@ -477,13 +477,22 @@ public class Main {
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<>();
args.add("java");
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(kobaltJarFile.toFile().getAbsolutePath());
Collections.addAll(args, argv);
Collections.addAll(args, argv.toArray(new String[argv.size()]));
ProcessBuilder pb = new ProcessBuilder(args);
pb.inheritIO();