Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<maven.compiler.target>11</maven.compiler.target>
<native.maven.plugin>0.11.2</native.maven.plugin>
<mainClass>org.codejive.jvm.Main</mainClass>
<version.devkitman>0.4.3</version.devkitman>
<version.devkitman>0.4.4</version.devkitman>
<version.httpclient>5.6</version.httpclient>
<version.asciitable>0.3.2</version.asciitable>
<version.picocli>4.7.7</version.picocli>
Expand Down
64 changes: 62 additions & 2 deletions src/main/java/org/codejive/jvm/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
Main.ListInstalled.class,
Main.ListAvailable.class,
Main.ListProviders.class,
Main.ListDistros.class,
Main.Install.class,
Main.Uninstall.class,
Main.Default.class,
Expand All @@ -43,10 +44,31 @@
Main.Run.class
})
public class Main {

static List<String> providers;
static List<String> distros;
static boolean verbose = false;
static boolean quiet = false;

@Option(
names = {"-P", "--providers"},
description =
"Selects the providers to use. Run 'jvm list-providers' to see the available providers. Multiple providers can be specified separated by comma.",
split = ",",
scope = CommandLine.ScopeType.INHERIT)
void setProviders(List<String> providers) {
Main.providers = providers;
}

@Option(
names = {"-D", "--distros"},
description =
"Selects the distributions to use when installing JDKs. Run 'jvm list-distros' to see the available distributions. Multiple distributions can be specified separated by comma.",
split = ",",
scope = CommandLine.ScopeType.INHERIT)
void setDistros(List<String> distros) {
Main.distros = distros;
}

@Option(
names = {"-h", "--help"},
description = "Show this help message and exit.",
Expand Down Expand Up @@ -167,6 +189,35 @@ public Integer call() {
}
}

@Command(
name = "list-distros",
aliases = {"ld"},
description =
"List the available JDK distributions that can be used for '--distros' options")
static class ListDistros extends CmdBase {
@Override
public Integer call() {
System.err.println("Retrieving available distributions, this can take a moment...");
JdkManager manager = createJdkManager();
List<JdkDistroQuery.JdkDistro> distros = manager.listDistros();
distros.sort(Comparator.comparing(JdkDistroQuery.JdkDistro::name));

AsciiTable at = new AsciiTable();
CWC_LongestLine cwc = new CWC_LongestLine();
at.getRenderer().setCWC(cwc);
at.addRule();
at.addRow("Distribution");
at.addRule();
for (JdkDistroQuery.JdkDistro distro : distros) {
at.addRow(distro.name());
}
at.addRule();
System.out.println(at.render());

return 0;
}
}

@Command(
name = "install",
aliases = {"i"},
Expand Down Expand Up @@ -436,7 +487,16 @@ private static JdkManager createJdkManager() {
JdkDiscovery.Config cfg = new JdkDiscovery.Config(installPath, cachePath, null);
cfg.properties()
.put("link", JBangJdkProvider.getJBangConfigDir().resolve("currentjdk").toString());
return JdkManager.builder().providers(JdkProviders.instance().all(cfg)).build();
if (distros != null && !distros.isEmpty()) {
cfg.properties().put("distro", String.join(",", distros));
}
List<JdkProvider> provs;
if (providers == null || providers.isEmpty()) {
provs = JdkProviders.instance().all(cfg);
} else {
provs = JdkProviders.instance().parseNames(cfg, providers.toArray(new String[0]));
}
return JdkManager.builder().providers(provs).build();
}

private static Path cachePath() {
Expand Down