Skip to content

改善启动脚本导出 #5906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WhatDamon wants to merge 10 commits into
base: main
Choose a base branch
from
Open

改善启动脚本导出 #5906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
48faeba
update
WhatDamon Apr 4, 2026
78f490c
update
WhatDamon Apr 4, 2026
351dd19
update
WhatDamon Apr 4, 2026
eccc1b1
update
WhatDamon Apr 4, 2026
5c0edc4
update
WhatDamon Apr 5, 2026
6a8a426
update
WhatDamon Apr 5, 2026
c243801
update
WhatDamon Apr 5, 2026
3e915c9
update
WhatDamon Apr 5, 2026
43bc45a
update
WhatDamon Apr 5, 2026
a448248
update
WhatDamon Apr 5, 2026
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
20 changes: 20 additions & 0 deletions HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,11 @@ public static void generateLaunchScript(Profile profile, String id, Consumer<Lau
chooser.getExtensionFilters().add(new FileChooser.ExtensionFilter(i18n("extension.ps1"), "*.ps1"));
Path file = FileUtils.toPath(chooser.showSaveDialog(Controllers.getStage()));
if (file != null) {
if (!isValidScriptExtension(FileUtils.getExtension(file))) {
String defaultExt = getDefaultScriptExtension();
file = file.resolveSibling(file.getFileName().toString() + "." + defaultExt);
}

LauncherHelper launcherHelper = new LauncherHelper(profile, account, id);
for (Consumer<LauncherHelper> injecter : injecters) {
injecter.accept(launcherHelper);
Expand All @@ -273,6 +278,21 @@ public static void generateLaunchScript(Profile profile, String id, Consumer<Lau
});
}

private static boolean isValidScriptExtension(String ext) {
if (OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS) {
return ext.equalsIgnoreCase("bat") || ext.equalsIgnoreCase("ps1");
}
return ext.equalsIgnoreCase("sh") || ext.equalsIgnoreCase("bash") || ext.equalsIgnoreCase("command") || ext.equalsIgnoreCase("ps1");
}

private static String getDefaultScriptExtension() {
return switch (OperatingSystem.CURRENT_OS) {
case WINDOWS -> "bat";
case MACOS -> "command";
default -> "sh";
};
}

@SafeVarargs
public static void launch(Profile profile, String id, Consumer<LauncherHelper>... injecters) {
if (!checkVersionForLaunching(profile, id))
Expand Down
6 changes: 3 additions & 3 deletions HMCLCore/src/main/java/org/jackhuang/hmcl/launch/DefaultLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,10 +644,10 @@ public void makeLaunchScript(Path scriptFile) throws IOException {
boolean usePowerShell = "ps1".equals(scriptExtension);

if (!usePowerShell) {
if (isWindows && !scriptExtension.equals("bat"))
if (isWindows && !scriptExtension.equalsIgnoreCase("bat"))
throw new IllegalArgumentException("The extension of " + scriptFile + " is not 'bat' or 'ps1' in Windows");
else if (!isWindows && !(scriptExtension.equals("sh") || scriptExtension.equals("command")))
throw new IllegalArgumentException("The extension of " + scriptFile + " is not 'sh', 'ps1' or 'command' in macOS/Linux");
else if (!isWindows && !(scriptExtension.equalsIgnoreCase("sh") || scriptExtension.equalsIgnoreCase("command") || scriptExtension.equalsIgnoreCase("bash")))
throw new IllegalArgumentException("The extension of " + scriptFile + " is not 'sh', 'bash', 'ps1' or 'command' in macOS/Linux");
}

final Command commandLine = generateCommandLine(nativeFolder);
Expand Down