3 Commits

Author SHA1 Message Date
zs-yg
ff0cf01100 添加一键删除打包文件夹至构建脚本 2025-11-21 19:13:38 +08:00
zs-yg
b88c7507aa 添加7z一键压缩至构建脚本 2025-11-21 19:12:18 +08:00
zs-yg
969fcdff6e 修复下载jre的已知问题 2025-11-20 21:08:01 +08:00
3 changed files with 32 additions and 2 deletions

View File

@@ -50,7 +50,7 @@ namespace MCSJ
LogMain.Info($"版本下载完成: {version}"); LogMain.Info($"版本下载完成: {version}");
break; break;
case "3": case "3":
Console.Write("请输入要下载的JRE版本(jre8,jre11): "); Console.Write("请输入要下载的JRE版本(jre8,jre11,jre17/21/25): ");
var jreVersion = Console.ReadLine(); var jreVersion = Console.ReadLine();
if (string.IsNullOrWhiteSpace(jreVersion)) if (string.IsNullOrWhiteSpace(jreVersion))
{ {

View File

@@ -21,6 +21,13 @@ namespace MCSJ.Tools.JreDownload
public async Task DownloadAndSetupJre(string version) public async Task DownloadAndSetupJre(string version)
{ {
// 0. 检查是否已存在该版本
if (CheckJreExists(version))
{
Console.WriteLine($"JRE {version} 已存在,无需重复下载");
return;
}
// 1. 读取jrelist.txt获取下载链接 // 1. 读取jrelist.txt获取下载链接
var downloadUrl = GetDownloadUrl(version); var downloadUrl = GetDownloadUrl(version);
if (string.IsNullOrEmpty(downloadUrl)) if (string.IsNullOrEmpty(downloadUrl))
@@ -165,6 +172,23 @@ namespace MCSJ.Tools.JreDownload
return Directory.GetFiles(folder, exeName, SearchOption.AllDirectories).FirstOrDefault(); return Directory.GetFiles(folder, exeName, SearchOption.AllDirectories).FirstOrDefault();
} }
private bool CheckJreExists(string version)
{
var tomlPath = Path.Combine(SetupFolder, "jre.toml");
if (!File.Exists(tomlPath))
return false;
try
{
var content = File.ReadAllText(tomlPath);
return content.Contains($"[jre.{version}]");
}
catch
{
return false;
}
}
private void CreateJreToml(string version, string javaExePath, string javawExePath) private void CreateJreToml(string version, string javaExePath, string javawExePath)
{ {
if (!Directory.Exists(SetupFolder)) if (!Directory.Exists(SetupFolder))

View File

@@ -5,5 +5,11 @@ ren win-x64 MCSJ-x64
ren win-x86 MCSJ-x86 ren win-x86 MCSJ-x86
rmdir /s /q MCSJ-x64\publish rmdir /s /q MCSJ-x64\publish
rmdir /s /q MCSJ-x86\publish rmdir /s /q MCSJ-x86\publish
7z a -t7z MCSJ-x64.7z MCSJ-x64
7z a -t7z MCSJ-x86.7z MCSJ-x86
7z a -tzip MCSJ-x64.zip MCSJ-x64 7z a -tzip MCSJ-x64.zip MCSJ-x64
7z a -tzip MCSJ-x86.zip MCSJ-x86 7z a -tzip MCSJ-x86.zip MCSJ-x86
7z a -ttar MCSJ-x64.tar MCSJ-x64
7z a -ttar MCSJ-x86.tar MCSJ-x86
rmdir /s /q MCSJ-x64
rmdir /s /q MCSJ-x86