在 macOS 上添加启动脚本的后缀 .command (#4927)
This commit is contained in:
@@ -209,6 +209,11 @@ public final class Versions {
|
|||||||
if (Files.isDirectory(repository.getRunDirectory(id)))
|
if (Files.isDirectory(repository.getRunDirectory(id)))
|
||||||
chooser.setInitialDirectory(repository.getRunDirectory(id).toFile());
|
chooser.setInitialDirectory(repository.getRunDirectory(id).toFile());
|
||||||
chooser.setTitle(i18n("version.launch_script.save"));
|
chooser.setTitle(i18n("version.launch_script.save"));
|
||||||
|
if (OperatingSystem.CURRENT_OS == OperatingSystem.MACOS) {
|
||||||
|
chooser.getExtensionFilters().add(
|
||||||
|
new FileChooser.ExtensionFilter(i18n("extension.command"), "*.command")
|
||||||
|
);
|
||||||
|
}
|
||||||
chooser.getExtensionFilters().add(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
|
chooser.getExtensionFilters().add(OperatingSystem.CURRENT_OS == OperatingSystem.WINDOWS
|
||||||
? new FileChooser.ExtensionFilter(i18n("extension.bat"), "*.bat")
|
? new FileChooser.ExtensionFilter(i18n("extension.bat"), "*.bat")
|
||||||
: new FileChooser.ExtensionFilter(i18n("extension.sh"), "*.sh"));
|
: new FileChooser.ExtensionFilter(i18n("extension.sh"), "*.sh"));
|
||||||
|
|||||||
@@ -376,6 +376,7 @@ extension.mod=Mod File
|
|||||||
extension.png=Image File
|
extension.png=Image File
|
||||||
extension.ps1=Windows PowerShell Script
|
extension.ps1=Windows PowerShell Script
|
||||||
extension.sh=Shell Script
|
extension.sh=Shell Script
|
||||||
|
extension.command=macOS Shell Script
|
||||||
|
|
||||||
fatal.create_hmcl_current_directory_failure=Hello Minecraft! Launcher cannot create the HMCL directory (%s). Please move HMCL to another location and reopen it.
|
fatal.create_hmcl_current_directory_failure=Hello Minecraft! Launcher cannot create the HMCL directory (%s). Please move HMCL to another location and reopen it.
|
||||||
fatal.javafx.incompatible=Missing JavaFX environment.\n\
|
fatal.javafx.incompatible=Missing JavaFX environment.\n\
|
||||||
|
|||||||
@@ -374,6 +374,7 @@ extension.mod=模組檔案
|
|||||||
extension.png=圖片檔案
|
extension.png=圖片檔案
|
||||||
extension.ps1=PowerShell 指令碼
|
extension.ps1=PowerShell 指令碼
|
||||||
extension.sh=Bash 指令碼
|
extension.sh=Bash 指令碼
|
||||||
|
extension.command=macOS Shell 指令碼
|
||||||
|
|
||||||
fatal.create_hmcl_current_directory_failure=Hello Minecraft! Launcher 無法建立 HMCL 資料夾 (%s),請將 HMCL 移動至其他位置再開啟。
|
fatal.create_hmcl_current_directory_failure=Hello Minecraft! Launcher 無法建立 HMCL 資料夾 (%s),請將 HMCL 移動至其他位置再開啟。
|
||||||
fatal.javafx.incompatible=缺少 JavaFX 執行環境。\nHMCL 無法在低於 Java 11 的 Java 環境上自行補全 JavaFX 執行環境。請更新到 Java 11 或更高版本。
|
fatal.javafx.incompatible=缺少 JavaFX 執行環境。\nHMCL 無法在低於 Java 11 的 Java 環境上自行補全 JavaFX 執行環境。請更新到 Java 11 或更高版本。
|
||||||
|
|||||||
@@ -383,6 +383,7 @@ extension.mod=模组文件
|
|||||||
extension.png=图片文件
|
extension.png=图片文件
|
||||||
extension.ps1=PowerShell 脚本
|
extension.ps1=PowerShell 脚本
|
||||||
extension.sh=Bash 脚本
|
extension.sh=Bash 脚本
|
||||||
|
extension.command=macOS Shell 脚本
|
||||||
|
|
||||||
fatal.create_hmcl_current_directory_failure=Hello Minecraft! Launcher 无法创建 HMCL 文件夹 (%s),请将 HMCL 移动至其他位置再启动。\n如遇到问题,你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。
|
fatal.create_hmcl_current_directory_failure=Hello Minecraft! Launcher 无法创建 HMCL 文件夹 (%s),请将 HMCL 移动至其他位置再启动。\n如遇到问题,你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。
|
||||||
fatal.javafx.incompatible=缺少 JavaFX 运行环境。\nHello Minecraft! Launcher 无法在低于 Java 11 的 Java 环境上自行补全 JavaFX 运行环境。请更新到 Java 11 或更高版本。\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。
|
fatal.javafx.incompatible=缺少 JavaFX 运行环境。\nHello Minecraft! Launcher 无法在低于 Java 11 的 Java 环境上自行补全 JavaFX 运行环境。请更新到 Java 11 或更高版本。\n你可以访问 https://docs.hmcl.net/help.html 页面寻求帮助。
|
||||||
|
|||||||
@@ -619,8 +619,8 @@ public class DefaultLauncher extends Launcher {
|
|||||||
if (!usePowerShell) {
|
if (!usePowerShell) {
|
||||||
if (isWindows && !scriptExtension.equals("bat"))
|
if (isWindows && !scriptExtension.equals("bat"))
|
||||||
throw new IllegalArgumentException("The extension of " + scriptFile + " is not 'bat' or 'ps1' in Windows");
|
throw new IllegalArgumentException("The extension of " + scriptFile + " is not 'bat' or 'ps1' in Windows");
|
||||||
else if (!isWindows && !scriptExtension.equals("sh"))
|
else if (!isWindows && !(scriptExtension.equals("sh") || scriptExtension.equals("command")))
|
||||||
throw new IllegalArgumentException("The extension of " + scriptFile + " is not 'sh' or 'ps1' in macOS/Linux");
|
throw new IllegalArgumentException("The extension of " + scriptFile + " is not 'sh', 'ps1' or 'command' in macOS/Linux");
|
||||||
}
|
}
|
||||||
|
|
||||||
final Command commandLine = generateCommandLine(nativeFolder);
|
final Command commandLine = generateCommandLine(nativeFolder);
|
||||||
|
|||||||
Reference in New Issue
Block a user