lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: update CommandBuilder methods to use addAll for multiple arguments (#5275)

Browse Source
This commit is contained in:
Glavo
2026-01-21 21:26:12 +08:00
committed by GitHub
parent 55cbb6cd2c
commit ba5e63395f
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/src/main/java/org/jackhuang/hmcl/Launcher.java
View File

@@ -253,7 +253,7 @@ public final class Launcher extends Application {
if (Files.exists(mcDir)) if (Files.exists(mcDir))
files.add(mcDir.toString()); files.add(mcDir.toString());
String command = new CommandBuilder().add("sudo", "chown", "-R", userName).addAll(files).toString(); String command = new CommandBuilder().addAll("sudo", "chown", "-R", userName).addAll(files).toString();
ButtonType copyAndExit = new ButtonType(i18n("button.copy_and_exit")); ButtonType copyAndExit = new ButtonType(i18n("button.copy_and_exit"));
if (showAlert(AlertType.ERROR, if (showAlert(AlertType.ERROR,

18
HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java
View File

@@ -72,14 +72,14 @@ public class DefaultLauncher extends Launcher {
if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) { if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
// res.add("cmd", "/C", "start", "unused title", "/B", "/high"); // res.add("cmd", "/C", "start", "unused title", "/B", "/high");
} else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() || OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) { } else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() || OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
res.add("nice", "-n", "-5"); res.addAll("nice", "-n", "-5");
} }
break; break;
case ABOVE_NORMAL: case ABOVE_NORMAL:
if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) { if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
// res.add("cmd", "/C", "start", "unused title", "/B", "/abovenormal"); // res.add("cmd", "/C", "start", "unused title", "/B", "/abovenormal");
} else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() || OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) { } else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() || OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
res.add("nice", "-n", "-1"); res.addAll("nice", "-n", "-1");
} }
break; break;
case NORMAL: case NORMAL:
@@ -89,14 +89,14 @@ public class DefaultLauncher extends Launcher {
if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) { if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
// res.add("cmd", "/C", "start", "unused title", "/B", "/belownormal"); // res.add("cmd", "/C", "start", "unused title", "/B", "/belownormal");
} else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() || OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) { } else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() || OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
res.add("nice", "-n", "1"); res.addAll("nice", "-n", "1");
} }
break; break;
case LOW: case LOW:
if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) { if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
// res.add("cmd", "/C", "start", "unused title", "/B", "/low"); // res.add("cmd", "/C", "start", "unused title", "/B", "/low");
} else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() || OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) { } else if (OperatingSystem.CURRENT_OS.isLinuxOrBSD() || OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
res.add("nice", "-n", "5"); res.addAll("nice", "-n", "5");
} }
break; break;
} }
@@ -179,7 +179,7 @@ public class DefaultLauncher extends Launcher {
if (addProxyOptions) { if (addProxyOptions) {
if (options.getProxyOption() == null || options.getProxyOption() == ProxyOption.Default.INSTANCE) { if (options.getProxyOption() == null || options.getProxyOption() == ProxyOption.Default.INSTANCE) {
res.add("-Djava.net.useSystemProxies=", "true"); res.add("-Djava.net.useSystemProxies=true");
} else if (options.getProxyOption() instanceof ProxyOption.Http httpProxy) { } else if (options.getProxyOption() instanceof ProxyOption.Http httpProxy) {
res.add("-Dhttp.proxyHost=" + httpProxy.host()); res.add("-Dhttp.proxyHost=" + httpProxy.host());
res.add("-Dhttp.proxyPort=" + httpProxy.port()); res.add("-Dhttp.proxyPort=" + httpProxy.port());
@@ -737,7 +737,7 @@ public class DefaultLauncher extends Launcher {
writer.newLine(); writer.newLine();
} }
writer.newLine(); writer.newLine();
writer.write(new CommandBuilder().add("cd", "/D", FileUtils.getAbsolutePath(repository.getRunDirectory(version.getId()))).toString()); writer.write(new CommandBuilder().addAll("cd", "/D", FileUtils.getAbsolutePath(repository.getRunDirectory(version.getId()))).toString());
} else { } else {
writer.write("#!/usr/bin/env bash"); writer.write("#!/usr/bin/env bash");
writer.newLine(); writer.newLine();
@@ -746,10 +746,10 @@ public class DefaultLauncher extends Launcher {
writer.newLine(); writer.newLine();
} }
if (commandLine.tempNativeFolder != null) { if (commandLine.tempNativeFolder != null) {
writer.write(new CommandBuilder().add("ln", "-s", FileUtils.getAbsolutePath(nativeFolder), commandLine.tempNativeFolder.toString()).toString()); writer.write(new CommandBuilder().addAll("ln", "-s", FileUtils.getAbsolutePath(nativeFolder), commandLine.tempNativeFolder.toString()).toString());
writer.newLine(); writer.newLine();
} }
writer.write(new CommandBuilder().add("cd", FileUtils.getAbsolutePath(repository.getRunDirectory(version.getId()))).toString()); writer.write(new CommandBuilder().addAll("cd", FileUtils.getAbsolutePath(repository.getRunDirectory(version.getId()))).toString());
} }
writer.newLine(); writer.newLine();
if (StringUtils.isNotBlank(options.getPreLaunchCommand())) { if (StringUtils.isNotBlank(options.getPreLaunchCommand())) {
@@ -769,7 +769,7 @@ public class DefaultLauncher extends Launcher {
writer.newLine(); writer.newLine();
} }
if (commandLine.tempNativeFolder != null) { if (commandLine.tempNativeFolder != null) {
writer.write(new CommandBuilder().add("rm", commandLine.tempNativeFolder.toString()).toString()); writer.write(new CommandBuilder().addAll("rm", commandLine.tempNativeFolder.toString()).toString());
writer.newLine(); writer.newLine();
} }
} }

13
HMCLCore/src/main/java/org/jackhuang/hmcl/util/platform/CommandBuilder.java
View File

@@ -48,13 +48,24 @@ public final class CommandBuilder {
} }
} }
/**
* Parsing will ignore your manual escaping
*
* @param arg command
* @return this
*/
public CommandBuilder add(String arg) {
raw.add(new Item(arg, true));
return this;
}
/** /**
* Parsing will ignore your manual escaping * Parsing will ignore your manual escaping
* *
* @param args commands * @param args commands
* @return this * @return this
*/ */
public CommandBuilder add(String... args) { public CommandBuilder addAll(String... args) {
for (String s : args) for (String s : args)
raw.add(new Item(s, true)); raw.add(new Item(s, true));
return this; return this;