diff --git a/GC-BOOT/Program.cs b/GC-BOOT/Program.cs index 3c0099c..0b1b532 100644 --- a/GC-BOOT/Program.cs +++ b/GC-BOOT/Program.cs @@ -15,6 +15,9 @@ internal static class Program var paths = AppPaths.Discover(); paths.EnsureCreated(); + // 目录约定 + 双语日志 + 把包里的守护进程落到 .GC/safedog + RuntimeLayout.Ensure(paths); + // 上次下载的启动器新版,到这次启动才应用 if (DownloadModuleHost.Factory.TryApplyPending(paths)) return; diff --git a/GC-DOWNLOAD/LauncherArtifacts.cs b/GC-DOWNLOAD/LauncherArtifacts.cs index 6ec7328..8ddc247 100644 --- a/GC-DOWNLOAD/LauncherArtifacts.cs +++ b/GC-DOWNLOAD/LauncherArtifacts.cs @@ -46,9 +46,9 @@ public static class LauncherArtifacts return new[] { label, rid }; } - /// 启动器包应有的文件名,如 GC-1.0.7-mac-arm64.zip。 + /// 启动器包应有的文件名,如 GCL-1.0.9-mac-arm64.zip。 public static string PackageFileName(string version, string rid) - => $"GC-{version.Trim().TrimStart('v', 'V')}-{LabelOf(rid)}.zip"; + => $"GCL-{version.Trim().TrimStart('v', 'V')}-{LabelOf(rid)}.zip"; /// /// 判断某个 zip 名是不是「这个版本 + 这个平台」的启动器包。 @@ -57,7 +57,9 @@ public static class LauncherArtifacts public static bool LooksLikePackage(string fileName, string version, string rid) { if (!fileName.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)) return false; - if (!fileName.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) return false; + // 新包叫 GCL-<版本>-<平台>.zip;旧包(GC-)仍认,方便从旧版本升级。 + if (!fileName.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase) && + !fileName.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) return false; var v = version.Trim().TrimStart('v', 'V'); if (v.Length > 0 && fileName.IndexOf(v, StringComparison.OrdinalIgnoreCase) < 0) return false; diff --git a/GC-DOWNLOAD/LauncherUpdater.cs b/GC-DOWNLOAD/LauncherUpdater.cs index a3e3113..bfb0845 100644 --- a/GC-DOWNLOAD/LauncherUpdater.cs +++ b/GC-DOWNLOAD/LauncherUpdater.cs @@ -367,9 +367,9 @@ public static class LauncherUpdater else if (File.Exists(manifestCopy)) File.Delete(manifestCopy); - // 包名:GC-<版本>-<平台标签>.app/.exe(SAVEDOG 找不到时会自行扫描包内顶层)。 + // 包名:GCL-<版本>-<平台标签>.app/.exe(SAVEDOG 找不到时会自行扫描包内顶层)。 // Linux 的启动器没有扩展名,别硬加 .exe —— 那会让按包名查找永远落空。 - var packageName = $"GC-{latest}-{PlatformLabel}" + + var packageName = $"GCL-{latest}-{PlatformLabel}" + (OperatingSystem.IsMacOS() ? ".app" : OperatingSystem.IsWindows() ? ".exe" : ""); @@ -729,7 +729,7 @@ public static class LauncherUpdater // Linux 的启动器没有扩展名(GC-1.0.9-linux-amd64),以前只认 .app/.exe, // 结果解压完判定「没找到新版启动器」,Linux 更新永远失败。 // 注意不能用 Path.HasExtension:版本号 9.9.9 里的点会让它误判成有扩展名。 - if (name.StartsWith("GC-", StringComparison.OrdinalIgnoreCase) && + if (name.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase) && name.EndsWith("-" + PlatformLabel, StringComparison.OrdinalIgnoreCase)) { TryMarkExecutable(dest); diff --git a/GC-DOWNLOAD/SavedogLauncher.cs b/GC-DOWNLOAD/SavedogLauncher.cs index 7534336..7786230 100644 --- a/GC-DOWNLOAD/SavedogLauncher.cs +++ b/GC-DOWNLOAD/SavedogLauncher.cs @@ -20,9 +20,17 @@ public static class SavedogLauncher var name = SavedogFiles.ExecutableName; var install = paths.InstallDirectory; + // 首选 .GC/safedog:更新时整目录替换不会碰这里,正在运行的守护进程也安全。 + var home = Path.Combine(paths.SafedogRoot, name); + if (File.Exists(home)) return home; + var direct = Path.Combine(install, name); if (File.Exists(direct)) return direct; + // 新包把守护进程放在 safedog/ 子目录 + var packaged = Path.Combine(install, "safedog", name); + if (File.Exists(packaged)) return packaged; + // macOS:可能放在 .app 内部 try { diff --git a/GC-DOWNLOAD/VersionUtil.cs b/GC-DOWNLOAD/VersionUtil.cs index 98d96c3..f0e2ff1 100644 --- a/GC-DOWNLOAD/VersionUtil.cs +++ b/GC-DOWNLOAD/VersionUtil.cs @@ -4,7 +4,7 @@ using System.Globalization; namespace GC.Services; /// -/// 版本号工具:Release tag 有 v1.0.6 / GC-1.0.6 / 1.0.6 等写法, +/// 版本号工具:Release tag 有 v1.0.6 / GCL-1.0.6 / GC-1.0.6 / 1.0.6 等写法, /// 统一成可比较的 Version 再排序,挑**版本号最高**的那个。 /// public static class VersionUtil @@ -15,8 +15,9 @@ public static class VersionUtil if (string.IsNullOrWhiteSpace(tag)) return ""; var s = tag!.Trim(); - // 去掉前缀:v / V / GC- / release- - if (s.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) s = s[3..]; + // 去掉前缀:v / V / GC- / GCL- / release- + if (s.StartsWith("GCL-", StringComparison.OrdinalIgnoreCase)) s = s[4..]; + else if (s.StartsWith("GC-", StringComparison.OrdinalIgnoreCase)) s = s[3..]; else if (s.StartsWith("release-", StringComparison.OrdinalIgnoreCase)) s = s[8..]; s = s.TrimStart('v', 'V'); diff --git a/GC-SAVEDOG/Applier.cs b/GC-SAVEDOG/Applier.cs index 2745fde..2d9c875 100644 --- a/GC-SAVEDOG/Applier.cs +++ b/GC-SAVEDOG/Applier.cs @@ -31,7 +31,7 @@ internal sealed class Applier /// 发布包里的启动器文件名:GC-1.0.9-win-amd64.exe。 private static readonly Regex VersionedExePattern = new( - @"^GC-\d+(?:\.\d+)+-[A-Za-z0-9]+-[A-Za-z0-9]+\.exe$", + @"^(?:GC|GCL)-\d+(?:\.\d+)+-[A-Za-z0-9]+-[A-Za-z0-9]+\.exe$", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Compiled); public Applier(ApplyOptions options, Log log) @@ -46,20 +46,24 @@ internal sealed class Applier var requestPath = Path.Combine(updateDir, SavedogFiles.ApplyRequest); if (!File.Exists(requestPath)) - return Fail(updateDir, "找不到更新申请 " + SavedogFiles.ApplyRequest, 3); + return Fail(updateDir, "找不到更新申请 " + SavedogFiles.ApplyRequest, 3, + "Update request not found: " + SavedogFiles.ApplyRequest); var request = Json.Read(requestPath); if (request == null || string.IsNullOrWhiteSpace(request.Version)) - return Fail(updateDir, "更新申请内容不完整", 3); + return Fail(updateDir, "更新申请内容不完整", 3, "The update request is incomplete"); if (!ValidName(request.PackageName)) - return Fail(updateDir, "更新包名不合法: " + request.PackageName, 3); + return Fail(updateDir, "更新包名不合法: " + request.PackageName, 3, + "Invalid package name: " + request.PackageName); - _log.Info($"开始应用 v{request.Version}({request.Rid},{request.PackageName})"); + _log.Info($"开始应用 v{request.Version}({request.Rid},{request.PackageName})", + $"Starting apply of v{request.Version} ({request.Rid}, {request.PackageName})"); // 1. 等旧进程退出(否则 Windows 上文件还被占用) if (_options.WaitPid > 0 && !WaitForExit(_options.WaitPid, TimeSpan.FromSeconds(60))) - _log.Warn($"等待进程 {_options.WaitPid} 退出超时,继续尝试"); + _log.Warn($"等待进程 {_options.WaitPid} 退出超时,继续尝试", + $"Timed out waiting for process {_options.WaitPid} to exit; continuing anyway"); // 2. 安装目录定位与安全检查 var installDir = string.IsNullOrWhiteSpace(_options.InstallDir) @@ -67,10 +71,12 @@ internal sealed class Applier : Path.GetFullPath(_options.InstallDir!); if (!Directory.Exists(installDir)) - return Fail(updateDir, "安装目录不存在: " + installDir, 4); + return Fail(updateDir, "安装目录不存在: " + installDir, 4, + "Install directory does not exist: " + installDir); if (!_options.Force && File.Exists(Path.Combine(installDir, "GC.sln"))) - return Fail(updateDir, "检测到源码目录,拒绝在源码树里替换程序", 4); + return Fail(updateDir, "检测到源码目录,拒绝在源码树里替换程序", 4, + "Source tree detected; refusing to replace files inside it"); // 3. 二次验签:不信任「启动器说它验过了」 var require = request.RequireSignature && SignatureKeyring.Enforced; @@ -80,40 +86,50 @@ internal sealed class Applier if (verification.IsRejected) { - _log.Error($"清单验签失败({verification.Trust}):{verification.Error}"); + _log.Error($"清单验签失败({verification.Trust}):{verification.Error}", + $"Manifest signature check failed ({verification.Trust}): {verification.Error}"); return Refuse(updateDir, request, verification); } _log.Info($"清单可信度:{verification.Trust}" + - (verification.KeyId != null ? $"({verification.KeyId})" : "")); + (verification.KeyId != null ? $"({verification.KeyId})" : ""), + $"Manifest trust: {verification.Trust}" + + (verification.KeyId != null ? $" ({verification.KeyId})" : "")); // 4. 校验更新包 var zipPath = Path.Combine(updateDir, request.PackageZip); if (!File.Exists(zipPath)) - return Fail(updateDir, "更新包不存在: " + request.PackageZip, 5); + return Fail(updateDir, "更新包不存在: " + request.PackageZip, 5, + "Package not found: " + request.PackageZip); var zipInfo = new FileInfo(zipPath); if (request.PackageSize > 0 && zipInfo.Length != request.PackageSize) - return Fail(updateDir, $"更新包体积不符(期望 {request.PackageSize},实际 {zipInfo.Length})", 5); + return Fail(updateDir, $"更新包体积不符(期望 {request.PackageSize},实际 {zipInfo.Length})", 5, + $"Package size mismatch (expected {request.PackageSize}, got {zipInfo.Length})"); var actualSha = ContentHash.Sha256File(zipPath); if (!string.IsNullOrWhiteSpace(request.PackageSha256) && !string.Equals(actualSha, request.PackageSha256, StringComparison.OrdinalIgnoreCase)) { - return Fail(updateDir, "更新包 sha256 与清单不符,已丢弃", 5); + return Fail(updateDir, "更新包 sha256 与清单不符,已丢弃", 5, + "Package sha256 does not match the manifest; discarded"); } if (string.IsNullOrWhiteSpace(request.PackageSha256)) - _log.Warn("清单没有提供 sha256,仅依赖签名与解压校验"); + _log.Warn("清单没有提供 sha256,仅依赖签名与解压校验", + "Manifest has no sha256; relying on the signature and extraction checks only"); SafeArchive.Inspection inspection; try { inspection = SafeArchive.Inspect(zipPath); _log.Info($"更新包检查通过:{inspection.Entries} 个条目," + - $"{inspection.UncompressedBytes / 1024 / 1024} MB,压缩比 {inspection.Ratio:0.0}:1"); + $"{inspection.UncompressedBytes / 1024 / 1024} MB,压缩比 {inspection.Ratio:0.0}:1", + $"Package inspection passed: {inspection.Entries} entries, " + + $"{inspection.UncompressedBytes / 1024 / 1024} MB, ratio {inspection.Ratio:0.0}:1"); } catch (Exception ex) { - return Fail(updateDir, "更新包安全性检查失败: " + ex.Message, 5); + return Fail(updateDir, "更新包安全性检查失败: " + ex.Message, 5, + "Package safety check failed: " + ex.Message); } // 5. 解压到暂存区(与安装目录同卷,后续 rename 才是原子的) @@ -127,14 +143,15 @@ internal sealed class Applier catch (Exception ex) { ClearDirectory(stage); - return Fail(updateDir, "解压失败: " + ex.Message, 6); + return Fail(updateDir, "解压失败: " + ex.Message, 6, "Extraction failed: " + ex.Message); } var artifact = FindArtifact(stage, request.PackageName); if (artifact == null) { ClearDirectory(stage); - return Fail(updateDir, "更新包里没有找到新版程序(" + request.PackageName + ")", 6); + return Fail(updateDir, "更新包里没有找到新版程序(" + request.PackageName + ")", 6, + "No new launcher found in the package (" + request.PackageName + ")"); } // 主程序:优先用清单里的包名,否则按已知名字挑一个(发布包是整目录, @@ -145,7 +162,9 @@ internal sealed class Applier if (_options.DryRun) { _log.Info($"[dry-run] 校验全部通过,将整目录安装到 {installDir}" + - $"({Directory.GetFileSystemEntries(stage).Length} 个顶层条目)"); + $"({Directory.GetFileSystemEntries(stage).Length} 个顶层条目)", + $"[dry-run] All checks passed; would install the whole directory to {installDir} " + + $"({Directory.GetFileSystemEntries(stage).Length} top-level entries)"); ClearDirectory(stage); return 0; } @@ -155,7 +174,8 @@ internal sealed class Applier (File.Exists(mainTarget) || Directory.Exists(mainTarget))) { // 同一版本重复下发:当成已安装,避免反复覆盖正在运行的文件 - _log.Info($"v{request.Version} 已安装且上次启动正常,视为已安装"); + _log.Info($"v{request.Version} 已安装且上次启动正常,视为已安装", + $"v{request.Version} is already installed and started fine last time; treating as installed"); ClearDirectory(stage); TryDelete(zipPath); TryDelete(requestPath); @@ -177,9 +197,10 @@ internal sealed class Applier { RestoreFromBackup(installDir, replaced); ClearDirectory(stage); - return Fail(updateDir, "安装失败: " + replaceError, 7); + return Fail(updateDir, "安装失败: " + replaceError, 7, "Installation failed: " + replaceError); } - _log.Info($"新版已就位:{mainName}(替换 {replaced.Count} 个条目)"); + _log.Info($"新版已就位:{mainName}(替换 {replaced.Count} 个条目)", + $"New version in place: {mainName} (replaced {replaced.Count} entries)"); // 7. 启动并看护 StartupHealth.Clear(updateDir); @@ -192,7 +213,8 @@ internal sealed class Applier catch (Exception ex) { child = null; - _log.Error("启动新版失败: " + ex.Message); + _log.Error("启动新版失败: " + ex.Message, + "Failed to start the new version: " + ex.Message); } var healthy = child != null && WaitForHealth(updateDir, request.Version, child, @@ -200,7 +222,8 @@ internal sealed class Applier if (healthy) { - _log.Info($"v{request.Version} 启动正常,更新完成"); + _log.Info($"v{request.Version} 启动正常,更新完成", + $"v{request.Version} started successfully; update complete"); CleanupBackup(updateDir); WriteLastGood(updateDir, request.Version, mainName); WriteState(updateDir, new SavedogState @@ -219,10 +242,12 @@ internal sealed class Applier } // 8. 回滚:撤掉新装的文件,把备份原样搬回 - _log.Error($"v{request.Version} 启动后未通过健康检查({_options.TimeoutSeconds}s),开始回滚"); + _log.Error($"v{request.Version} 启动后未通过健康检查({_options.TimeoutSeconds}s),开始回滚", + $"v{request.Version} did not pass the health check after {_options.TimeoutSeconds}s; rolling back"); TryKill(child); var restored = RestoreFromBackup(installDir, replaced); - _log.Info(restored ? "已还原为更新前的文件" : "部分文件未能还原,请手动重新安装"); + _log.Info(restored ? "已还原为更新前的文件" : "部分文件未能还原,请手动重新安装", + restored ? "Restored the pre-update files" : "Some files could not be restored; please reinstall manually"); var relaunched = restored && TryLaunchPrevious(installDir, updateDir, previous, request.PlatformLabel); WriteState(updateDir, new SavedogState @@ -330,7 +355,7 @@ internal sealed class Applier { if (!fileName.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) return 0; - // 发布包把启动器改名成 GC-<版本>-<系统>-<架构>.exe,先按这个模式认出来。 + // 发布包把启动器改名成 GCL-<版本>-<系统>-<架构>.exe(旧包是 GC-),先按这个模式认出来。 if (VersionedExePattern.IsMatch(fileName)) return 110; var name = Path.GetFileNameWithoutExtension(fileName); @@ -413,13 +438,14 @@ internal sealed class Applier var health = StartupHealth.Read(updateDir); if (health != null && health.Ok && SameVersion(health.Version, version)) { - _log.Info($"收到健康标记(pid {health.Pid})"); + _log.Info($"收到健康标记(pid {health.Pid})", $"Health marker received (pid {health.Pid})"); return true; } if (child.HasExited) { - _log.Error($"新版进程已退出(退出码 {child.ExitCode})"); + _log.Error($"新版进程已退出(退出码 {child.ExitCode})", + $"The new process exited (code {child.ExitCode})"); return false; } Thread.Sleep(250); @@ -428,7 +454,8 @@ internal sealed class Applier // 超时但进程还活着:可能是尚未写入健康标记的旧构建,谨慎放行 if (!child.HasExited) { - _log.Warn("未收到健康标记,但进程仍在运行,按成功处理"); + _log.Warn("未收到健康标记,但进程仍在运行,按成功处理", + "No health marker, but the process is still running; treating as success"); return true; } return false; @@ -495,7 +522,8 @@ internal sealed class Applier { // 例如 GC-SAVEDOG.exe:本进程正在运行,Windows 上无法替换。 // 保留旧版守护进程即可,它下次启动会随包里的新版本一起被更新。 - _log.Warn($"跳过受保护文件,保留旧版本:{name}"); + _log.Warn($"跳过受保护文件,保留旧版本:{name}", + $"Skipping protected file, keeping the old one: {name}"); continue; } incoming.Add(entry); @@ -514,7 +542,7 @@ internal sealed class Applier var target = Path.Combine(backupDir, name); MoveEntry(entry, target); replaced.Add((name, target)); - _log.Info("旧版残留已备份: " + name); + _log.Info("旧版残留已备份: " + name, "Old leftover backed up: " + name); } // 2. 同名条目:旧 → backup,新 → 安装目录 @@ -568,12 +596,12 @@ internal sealed class Applier continue; MoveEntry(backup, target); - _log.Info("已还原: " + name); + _log.Info("已还原: " + name, "Restored: " + name); } catch (Exception ex) { ok = false; - _log.Warn($"还原 {name} 失败: {ex.Message}"); + _log.Warn($"还原 {name} 失败: {ex.Message}", $"Failed to restore {name}: {ex.Message}"); } } return ok; @@ -589,7 +617,7 @@ internal sealed class Applier } catch (Exception ex) { - _log.Warn("清理备份失败: " + ex.Message); + _log.Warn("清理备份失败: " + ex.Message, "Failed to clean up the backup: " + ex.Message); } } @@ -674,12 +702,14 @@ internal sealed class Applier try { Launch(candidate); - _log.Info("已回滚启动: " + Path.GetFileName(candidate)); + _log.Info("已回滚启动: " + Path.GetFileName(candidate), + "Rolled back and started: " + Path.GetFileName(candidate)); return true; } catch (Exception ex) { - _log.Warn($"回滚启动失败 {Path.GetFileName(candidate)}: {ex.Message}"); + _log.Warn($"回滚启动失败 {Path.GetFileName(candidate)}: {ex.Message}", + $"Failed to start rollback candidate {Path.GetFileName(candidate)}: {ex.Message}"); } } return false; @@ -690,12 +720,12 @@ internal sealed class Applier private void WriteState(string updateDir, SavedogState state) { try { Json.Write(Path.Combine(updateDir, SavedogFiles.State), state); } - catch (Exception ex) { _log.Warn("写状态失败: " + ex.Message); } + catch (Exception ex) { _log.Warn("写状态失败: " + ex.Message, "Failed to write state: " + ex.Message); } } - private int Fail(string updateDir, string message, int code) + private int Fail(string updateDir, string message, int code, string? messageEn = null) { - _log.Error(message); + _log.Error(message, messageEn ?? message); WriteState(updateDir, new SavedogState { Status = "failed", Message = message }); return code; } diff --git a/GC-SAVEDOG/GC-SAVEDOG.csproj b/GC-SAVEDOG/GC-SAVEDOG.csproj index 2afe2f7..946e9d2 100644 --- a/GC-SAVEDOG/GC-SAVEDOG.csproj +++ b/GC-SAVEDOG/GC-SAVEDOG.csproj @@ -42,6 +42,8 @@ ManifestLoader 依赖启动器的 RepoVersion 模型,守护进程不需要,排除。 --> + + diff --git a/GC-SAVEDOG/Log.cs b/GC-SAVEDOG/Log.cs index baf3257..567a64f 100644 --- a/GC-SAVEDOG/Log.cs +++ b/GC-SAVEDOG/Log.cs @@ -1,34 +1,22 @@ using System; -using System.IO; +using GC.Services; namespace GC.Savedog; -/// 同时写 stdout 与 .GC/update/savedog.log,便于用户离线排查。 +/// +/// 守护进程的日志入口,实际写入 :控制台 + .GC/logs 下的 +/// gc-YYYYMMDD.log(中文)与 gc-YYYYMMDD.en.log(英文)。 +/// +/// 每条日志都必须同时给中英两份文案 —— 用户反馈问题时直接发对应语言的文件。 +/// internal sealed class Log { - private readonly string? _path; - private readonly object _gate = new(); - - public Log(string? path) => _path = path; - - public void Info(string message) => Write("INFO ", message); - public void Warn(string message) => Write("WARN ", message); - public void Error(string message) => Write("ERROR", message); - - private void Write(string level, string message) + public Log(string? dir) { - var line = $"{DateTime.Now:yyyy-MM-dd HH:mm:ss} [{level}] {message}"; - Console.WriteLine(line); - if (string.IsNullOrWhiteSpace(_path)) return; - try - { - lock (_gate) - { - var dir = Path.GetDirectoryName(_path!); - if (!string.IsNullOrEmpty(dir)) Directory.CreateDirectory(dir); - File.AppendAllText(_path!, line + "\n"); - } - } - catch { /* 日志失败不能影响更新 */ } + if (!string.IsNullOrWhiteSpace(dir)) GcLog.Init(dir); } + + public void Info(string zh, string en) => GcLog.Info(zh, en); + public void Warn(string zh, string en) => GcLog.Warn(zh, en); + public void Error(string zh, string en) => GcLog.Error(zh, en); } diff --git a/GC-SAVEDOG/Program.cs b/GC-SAVEDOG/Program.cs index 7420682..bd35c60 100644 --- a/GC-SAVEDOG/Program.cs +++ b/GC-SAVEDOG/Program.cs @@ -67,7 +67,10 @@ internal static class Program return 3; } - var log = new Log(Path.Combine(Path.GetFullPath(updateDir), SavedogFiles.Log)); + // 日志统一放 .GC/logs(update 目录的上一层),不再塞在 update/ 里 + var updateRoot = Path.GetFullPath(updateDir); + var home = Path.GetDirectoryName(updateRoot) ?? updateRoot; + var log = new Log(Path.Combine(home, "logs")); var applyOptions = new ApplyOptions { UpdateDir = updateDir, diff --git a/GC-UI/backend/GC.UI.Server/Program.cs b/GC-UI/backend/GC.UI.Server/Program.cs index 76d3efc..b138115 100644 --- a/GC-UI/backend/GC.UI.Server/Program.cs +++ b/GC-UI/backend/GC.UI.Server/Program.cs @@ -76,6 +76,12 @@ builder.Services.AddCors(options => options.AddDefaultPolicy(policy => policy var app = builder.Build(); app.UseCors(); +// 日志与启动器共用 .GC/logs,整条启动链路(启动器 → 后端 → 守护进程)都在同一组文件里。 +var logPaths = AppPaths.Discover(); +GcLog.Init(logPaths.LogsRoot); +GcLog.Info($"GC-UI 后端启动,监听 127.0.0.1:{port}", + $"GC-UI backend started on 127.0.0.1:{port}"); + // 设置白名单 / 标识校验用到的规则(只在本进程内使用)。 var allowedLanguages = new HashSet(StringComparer.OrdinalIgnoreCase) { "auto", "zh-CN", "en" }; diff --git a/GC/src/Services/AppPaths.cs b/GC/src/Services/AppPaths.cs index 132d9c6..5dc0def 100644 --- a/GC/src/Services/AppPaths.cs +++ b/GC/src/Services/AppPaths.cs @@ -8,12 +8,14 @@ namespace GC.Services; /// 运行目录约定(可执行文件旁边,不内置任何模型): /// /// <安装目录>/ -/// GC(.exe | .app/...) +/// GCL(.exe | .app/...) /// .GC/ /// settings.json 设置与已安装版本记录 /// model/ 模型(启动时下载) /// cache/ 下载缓存 / 原子替换暂存 /// update/ 待下次启动应用的启动器更新包 +/// safedog/ 更新守护进程(首次启动从安装包复制过来) +/// logs/ 日志,按天分中英两份:gc-YYYYMMDD.log / .en.log /// /// 开发态同样使用仓库根 .GC/model,并自动同步仓库 model/ 的可分发部分。 /// EMS_MODELS / EMS_DATA / EMS_HOME 可显式覆盖。 @@ -40,6 +42,12 @@ public sealed class AppPaths public string CacheRoot => Path.Combine(HomeRoot, "cache"); public string UpdateRoot => Path.Combine(HomeRoot, "update"); + /// 日志目录:.GC/logs,里面按天放中英两份日志。 + public string LogsRoot => Path.Combine(HomeRoot, "logs"); + + /// 守护进程目录:.GC/safedog(程序本体与用户数据分开)。 + public string SafedogRoot => Path.Combine(HomeRoot, "safedog"); + /// 用户配置目录(与可重建的缓存分开,删 cache 不会丢设置)。 public string ConfigRoot => Path.Combine(HomeRoot, "config"); @@ -255,6 +263,8 @@ public sealed class AppPaths Directory.CreateDirectory(CacheRoot); Directory.CreateDirectory(ModelRoot); Directory.CreateDirectory(UpdateRoot); + Directory.CreateDirectory(LogsRoot); + Directory.CreateDirectory(SafedogRoot); MigrateLegacySettings(); diff --git a/GC/src/Services/GcLog.cs b/GC/src/Services/GcLog.cs new file mode 100644 index 0000000..aec27ad --- /dev/null +++ b/GC/src/Services/GcLog.cs @@ -0,0 +1,94 @@ +using System; +using System.IO; +using System.Text; + +namespace GC.Services; + +/// +/// 双语文件日志。 +/// +/// 每条记录同时写两个文件(都在 .GC/logs 下,按天滚动): +/// +/// gc-20261118.log 中文 +/// gc-20261118.en.log 英文 +/// +/// 中英分开而不是写在一个文件里:用户排查时不用在一行里找自己看得懂的那半句; +/// 也给反馈问题时直接发对应语言的文件即可。 +/// +/// 日志失败绝不影响主流程(磁盘满、只读目录都只是少一份日志)。 +/// +public static class GcLog +{ + private static readonly object Gate = new(); + private static string? _dir; + private static string _day = ""; + private static string _zhPath = ""; + private static string _enPath = ""; + + public static bool Enabled + { + get { lock (Gate) return _dir != null; } + } + + /// 绑定日志目录(通常是 .GC/logs)。重复调用会切到新目录。 + public static void Init(string dir) + { + try + { + Directory.CreateDirectory(dir); + } + catch + { + // 目录都建不了就退化成只写控制台 + return; + } + + lock (Gate) + { + _dir = dir; + _day = ""; + } + } + + public static void Info(string zh, string en) => Write("INFO ", zh, en); + public static void Warn(string zh, string en) => Write("WARN ", zh, en); + public static void Error(string zh, string en) => Write("ERROR", zh, en); + + private static void Write(string level, string zh, string en) + { + var now = DateTime.Now; + var prefix = $"{now:yyyy-MM-dd HH:mm:ss} [{level}] "; + var lineZh = prefix + zh; + var lineEn = prefix + en; + + try { Console.WriteLine(lineZh); } catch { /* 无控制台 */ } + + lock (Gate) + { + if (_dir == null) return; + + var day = now.ToString("yyyyMMdd"); + if (day != _day) + { + _day = day; + _zhPath = Path.Combine(_dir, $"gc-{day}.log"); + _enPath = Path.Combine(_dir, $"gc-{day}.en.log"); + } + + Append(_zhPath, lineZh); + Append(_enPath, lineEn); + } + } + + private static void Append(string path, string line) + { + try + { + File.AppendAllText(path, line + Environment.NewLine, new UTF8Encoding(false)); + } + catch + { + // 日志失败不能影响程序 + } + } +} diff --git a/GC/src/Services/ReleaseModels.cs b/GC/src/Services/ReleaseModels.cs index 049dfb8..f2b65ab 100644 --- a/GC/src/Services/ReleaseModels.cs +++ b/GC/src/Services/ReleaseModels.cs @@ -21,7 +21,7 @@ public sealed class ReleaseInfo public string Version => NormalizeVersion(TagName, Name); private static readonly string[] VersionPrefixes = - { "v", "V", "GC-", "gc-", "release-", "Release-" }; + { "v", "V", "GCL-", "gcl-", "GC-", "gc-", "release-", "Release-" }; private static readonly string[] PrereleaseTags = { "alpha", "beta", "rc", "pre", "dev", "snapshot" }; @@ -31,7 +31,7 @@ public sealed class ReleaseInfo var raw = !string.IsNullOrWhiteSpace(tag) ? tag : name; if (string.IsNullOrWhiteSpace(raw)) return ""; raw = raw!.Trim(); - // "v1.0.1" / "GC-1.0.1" / "release-1.0.1" -> 取第一段像版本号的部分 + // "v1.0.1" / "GCL-1.0.1" / "GC-1.0.1" / "release-1.0.1" -> 取第一段像版本号的部分 foreach (var prefix in VersionPrefixes) if (raw.StartsWith(prefix, StringComparison.Ordinal)) { raw = raw[prefix.Length..]; break; } // 形如 GC-1.0.1-Win-amd64 时只取版本段;但 2.3.0-beta 这类预发布串要保留完整。 diff --git a/GC/src/Services/RuntimeLayout.cs b/GC/src/Services/RuntimeLayout.cs new file mode 100644 index 0000000..d4df787 --- /dev/null +++ b/GC/src/Services/RuntimeLayout.cs @@ -0,0 +1,120 @@ +using System; +using System.IO; + +namespace GC.Services; + +/// +/// 运行期目录准备: +/// +/// 创建 .GC/logs 与 .GC/safedog; +/// 把安装包里的守护进程复制到 .GC/safedog(程序本体与用户数据分开); +/// 初始化双语日志并写一条启动记录。 +/// +/// +/// 为什么要复制而不是直接用包里的:更新时会整目录替换程序文件, +/// 正在运行的守护进程无法被覆盖。放到 .GC 后,整目录替换永远不碰它, +/// 新版守护进程在下一次启动时复制进来即可。 +/// +public static class RuntimeLayout +{ + /// 准备目录与日志,返回实际使用的守护进程路径(可能为 null)。 + public static string? Ensure(AppPaths paths) + { + try { Directory.CreateDirectory(paths.LogsRoot); } catch { } + try { Directory.CreateDirectory(paths.SafedogRoot); } catch { } + + GcLog.Init(paths.LogsRoot); + + var safedog = InstallSafedog(paths); + + GcLog.Info( + $"启动 GC {LauncherRuntimeInfo.CurrentLauncherVersion}({LauncherRuntimeInfo.CurrentRid})," + + $"数据目录 {paths.HomeRoot},守护进程 {(safedog == null ? "未找到" : Path.GetFileName(safedog))}", + $"Starting GC {LauncherRuntimeInfo.CurrentLauncherVersion} ({LauncherRuntimeInfo.CurrentRid}), " + + $"data directory {paths.HomeRoot}, safedog {(safedog == null ? "not found" : Path.GetFileName(safedog))}"); + + return safedog; + } + + /// 把包内守护进程同步到 .GC/safedog。已是最新则不动。 + private static string? InstallSafedog(AppPaths paths) + { + var name = SavedogFiles.ExecutableName; + var target = Path.Combine(paths.SafedogRoot, name); + + var source = FindPackaged(paths, name); + if (source != null && NeedsCopy(source, target)) + { + try + { + Directory.CreateDirectory(paths.SafedogRoot); + File.Copy(source, target, overwrite: true); + MarkExecutable(target); + GcLog.Info($"已更新守护进程到 {target}", $"Safedog updated at {target}"); + } + catch (Exception ex) + { + GcLog.Warn($"复制守护进程失败(继续使用已有版本):{ex.Message}", + $"Failed to copy safedog (falling back to the existing one): {ex.Message}"); + } + } + + return File.Exists(target) ? target : source; + } + + private static string? FindPackaged(AppPaths paths, string name) + { + var candidates = new[] + { + Path.Combine(paths.InstallDirectory, "safedog", name), + Path.Combine(paths.InstallDirectory, name), + Path.Combine(paths.AppRoot, "safedog", name), + Path.Combine(paths.AppRoot, name), + }; + + foreach (var candidate in candidates) + { + if (File.Exists(candidate)) return candidate; + } + + // macOS:可能在 .app/Contents/MacOS 里 + try + { + foreach (var app in Directory.GetDirectories(paths.InstallDirectory, "*.app")) + { + var inside = Path.Combine(app, "Contents", "MacOS", name); + if (File.Exists(inside)) return inside; + } + } + catch { } + + return null; + } + + private static bool NeedsCopy(string source, string target) + { + try + { + if (!File.Exists(target)) return true; + var a = new FileInfo(source); + var b = new FileInfo(target); + return a.Length != b.Length || a.LastWriteTimeUtc > b.LastWriteTimeUtc; + } + catch + { + return true; + } + } + + private static void MarkExecutable(string path) + { + if (OperatingSystem.IsWindows()) return; + try + { + var mode = File.GetUnixFileMode(path); + File.SetUnixFileMode(path, mode | UnixFileMode.UserExecute | + UnixFileMode.GroupExecute | UnixFileMode.OtherExecute); + } + catch { } + } +} diff --git a/GC/src/test/dotnet/GC.Tests/Program.cs b/GC/src/test/dotnet/GC.Tests/Program.cs index bdcffb6..03bc033 100644 --- a/GC/src/test/dotnet/GC.Tests/Program.cs +++ b/GC/src/test/dotnet/GC.Tests/Program.cs @@ -195,7 +195,7 @@ internal static class Program Directory.CreateDirectory(stage); // Linux 的启动器没有扩展名,测试包名要跟着平台走 var launcherExt = OperatingSystem.IsWindows() ? ".exe" : ""; - File.WriteAllText(Path.Combine(stage, "GC-9.9.9-" + LauncherUpdater.PlatformLabel + launcherExt), + File.WriteAllText(Path.Combine(stage, "GCL-9.9.9-" + LauncherUpdater.PlatformLabel + launcherExt), "new launcher"); var zip = Path.Combine(tmp, "GC-" + rid + ".zip"); ZipFile.CreateFromDirectory(stage, zip); @@ -238,14 +238,14 @@ internal static class Program { var script = File.ReadAllText(scriptPath); Check(!script.Contains(tmp), "脚本不含绝对路径"); - Check(script.Contains("GC-*.app") || script.Contains("GC-*"), "脚本按 GC-* 匹配删除"); + Check(script.Contains("GCL-*") || script.Contains("GC-*"), "脚本按 GCL-*/GC-* 匹配删除"); } // 5b) 只发产物、不发 Release:更新包只存在于仓库 dist/<系统>-<架构>/ 目录里。 // 清单不写 url、不写 path,只给 dir + name + sha256,客户端要能自己找过去。 var distDir = Path.Combine(remote, "dist", LauncherUpdater.PlatformLabel); Directory.CreateDirectory(distDir); - var distName = "GC-9.9.10-" + LauncherUpdater.PlatformLabel + ".zip"; + var distName = "GCL-9.9.10-" + LauncherUpdater.PlatformLabel + ".zip"; var distZip = Path.Combine(distDir, distName); File.Copy(zip, distZip, true); diff --git a/README.md b/README.md index b00e57e..38ca0ca 100644 --- a/README.md +++ b/README.md @@ -59,16 +59,24 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run ## 运行目录(发布包里就长这样) ``` -<安装目录>/ - GC.exe | GC.app/ - GC-SAVEDOG[.exe] 更新守护进程(与主程序同目录,macOS 在 .app/Contents/MacOS 内) - .GC/ - config/settings.json 用户设置(与缓存分开:删 cache 不会丢配置) - model/ 启动时下载的模型 - cache/ 下载暂存 / 原子替换 - update/ 待应用的启动器更新(apply-request.json + package.zip) +<解压出来的目录>/ ← 压缩包里只有这一个文件夹 + GCL-<版本>-<平台>(.exe | .app/) 启动器 + GC-UI(.exe) Flutter 前端 + safedog/GC-SAVEDOG[.exe] 更新守护进程(运行时复制到 .GC/safedog) + data/ lib/ *.dll 后端与 Flutter 运行时 + .GC/ 首次启动自动生成 + config/settings.json 用户设置(与缓存分开:删 cache 不会丢配置) + model/ 启动时下载的模型 + cache/ 下载暂存 / 原子替换 + update/ 待应用的启动器更新(apply-request.json + package.zip) + safedog/GC-SAVEDOG[.exe] 实际运行的守护进程(不随整目录替换被覆盖) + logs/gc-YYYYMMDD.log 日志(中文) + logs/gc-YYYYMMDD.en.log 日志(English) ``` +压缩包内只有一个顶层目录,解压后不会散落一屏 dll;主程序、后端、前端、守护进程都在 +这个目录里。`.GC` 紧挨着主程序,装在哪都便携 —— 整个目录复制走,模型、设置、日志跟着走。 + **发布包不含任何模型**。首次启动联网检查后把模型下载到 `.GC/model/` 并立刻显示; 安装目录不可写时自动退回用户数据目录。`.GC/cache` 与 `.GC/model` 随时可删,程序会重新下载; `.GC/config/settings.json` 删掉等于恢复出厂设置。 @@ -83,7 +91,7 @@ Windows 用 `.\build.ps1`,参数相同(`build / check / models / stamp / run 启动器更新的完整流程: ``` -启动器下载 zip -> 校验 sha256 -> 写 apply-request.json -> 启动 GC-SAVEDOG -> 自己退出 +启动器下载 zip -> 校验 sha256 -> 写 apply-request.json -> 启动 .GC/safedog/GC-SAVEDOG -> 自己退出 GC-SAVEDOG: 二次验签 -> 检查 zip 安全性 -> 解压到 .GC/update/stage -> 整目录替换:旧文件搬到 .GC/update/backup,新文件就位(保留 .GC 不动) -> 启动新版,等 .GC/update/health.json @@ -217,8 +225,8 @@ Repository/ | 方式 | 清单字段 | 说明 | | --- | --- | --- | -| Release 附件(推荐) | `url` | `.../releases/download/v<版本>/GC-<版本>-<系统>-<架构>.zip` | -| 仓库编译产物 | `path` / `dir` / `name` | `dist/<系统>-<架构>/GC-<版本>-<系统>-<架构>.zip` | +| Release 附件(推荐) | `url` | `.../releases/download/<版本>/GCL-<版本>-<系统>-<架构>.zip` | +| 仓库编译产物 | `path` / `dir` / `name` | `dist/<系统>-<架构>/GCL-<版本>-<系统>-<架构>.zip` | 下载端按 `url` → `path` → `dist/<系统>-<架构>/` 目录扫描的顺序尝试, **每个候选都必须与清单里的 `sha256` 一致**(`sha256` 由签名保护), @@ -244,14 +252,15 @@ Repository/ | 产物 | 平台 | | --- | --- | -| `dist/mac-arm64/GC-<版本>-mac-arm64.zip` | macOS Apple Silicon 应用包(含 GC-SAVEDOG) | -| `dist/win-amd64/GC-<版本>-win-amd64.zip` | Windows x64 单文件启动器 + `GC-SAVEDOG.exe` | -| `dist/win-arm64/GC-<版本>-win-arm64.zip` | Windows on ARM 同上 | +| `dist/mac-arm64/GCL-<版本>-mac-arm64.zip` | macOS Apple Silicon(单顶层 `GCL-….app`) | +| `dist/win-amd64/GCL-<版本>-win-amd64.zip` | Windows x64(单顶层 `GCL-…/`,含 Flutter 前端与 `safedog/`) | +| `dist/win-arm64/GCL-<版本>-win-arm64.zip` | Windows on ARM 同上 | +| `dist/linux-amd64/GCL-<版本>-linux-amd64.zip` | Linux x64 同上(启动器无扩展名) | 平台目录就是「该平台的编译产物目录」:打包完成后只留最终 zip(原始 `.app` / `.exe` 会被挪到 `build/trash/`,下次构建时移出,不做递归删除)。 -发新版:`./build.sh build -version=1.0.8` → 把 `dist/<平台>/GC-1.0.8-<平台>.zip` +发新版:`./build.sh build -version=1.0.10` → 把 `dist/<平台>/GCL-1.0.10-<平台>.zip` 上传到 Gitea Release(tag `v1.0.8`),**或者**直接提交/上传到仓库的 `dist/<平台>/` 目录 → 提交并推送 `version.json` / `model/version.json`。 两种都能被客户端识别,客户端下次启动就会看到更新。 diff --git a/buildsh/lib/build_funcs.sh b/buildsh/lib/build_funcs.sh index 00c7134..e15d65e 100644 --- a/buildsh/lib/build_funcs.sh +++ b/buildsh/lib/build_funcs.sh @@ -164,9 +164,9 @@ pack_models() { # 启动器更新包:只包含程序文件,排除 .GC(否则会覆盖用户已下载的模型与设置) # # 产物落点遵循「仓库 dist/<系统>-<架构>/」布局: -# dist/mac-arm64/GC-<版本>-mac-arm64.zip -# dist/win-amd64/GC-<版本>-win-amd64.zip -# dist/win-arm64/GC-<版本>-win-arm64.zip +# dist/mac-arm64/GCL-<版本>-mac-arm64.zip +# dist/win-amd64/GCL-<版本>-win-amd64.zip +# dist/win-arm64/GCL-<版本>-win-arm64.zip # 启动器更新时既可以从 Release 附件下载,也会到这些目录里找编译产物 # (见 GC-DOWNLOAD/LauncherArtifacts.cs),所以两种发布方式都能用。 # @@ -279,51 +279,64 @@ pack_launcher() { [ -f "$EXE" ] || EXE=$(ls "$SRC"/*.exe 2>/dev/null | grep -v 'GC-SAVEDOG\|GC.UI.Server\|GC-UI' | head -1) [ -n "$EXE" ] || continue + # 包内只有一个顶层目录(GCL-<版本>-<平台>),解压后不会散落一屏 dll。 TMP="$ROOT_DIR/dist/.winpkg-$LABEL" - rm -rf "$TMP"; mkdir -p "$TMP" - cp -R "$SRC"/. "$TMP"/ - rm -f "$TMP"/*.zip - mv "$TMP/$(basename "$EXE")" "$TMP/GC-${VERSION}-${LABEL}.exe" - chmod +x "$TMP/GC-${VERSION}-${LABEL}.exe" 2>/dev/null || true - if [ ! -f "$TMP/GC-SAVEDOG.exe" ]; then + PKGNAME="GCL-${VERSION}-${LABEL}" + PKG="$TMP/$PKGNAME" + rm -rf "$TMP"; mkdir -p "$PKG" + cp -R "$SRC"/. "$PKG"/ + rm -f "$PKG"/*.zip + mv "$PKG/$(basename "$EXE")" "$PKG/$PKGNAME.exe" + chmod +x "$PKG/$PKGNAME.exe" 2>/dev/null || true + if [ ! -f "$PKG/GC-SAVEDOG.exe" ]; then echo " !! 缺少 GC-SAVEDOG.exe,该平台将退回旧脚本更新" + else + # 守护进程放 safedog/:首次启动复制到 .GC/safedog,更新替换不再动它 + mkdir -p "$PKG/safedog" + mv "$PKG/GC-SAVEDOG.exe" "$PKG/safedog/" fi - if [ ! -f "$TMP/GC-UI.exe" ]; then + if [ ! -f "$PKG/GC-UI.exe" ]; then echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面" fi - ZIP="$ROOT_DIR/dist/$LABEL/GC-${VERSION}-${LABEL}.zip" + ZIP="$ROOT_DIR/dist/$LABEL/$PKGNAME.zip" rm -f "$ZIP" - ( cd "$TMP" && zip -qr "$ZIP" . ) + ( cd "$TMP" && zip -qr "$ZIP" "$PKGNAME" ) rm -rf "$TMP" - echo " -> dist/$LABEL/GC-${VERSION}-${LABEL}.zip" + echo " -> dist/$LABEL/$PKGNAME.zip" done # --- Linux:整目录打包(启动器 + 守护 + 后端 + Flutter 前端)--- SRC="$ROOT_DIR/dist/linux-amd64" if [ -d "$SRC" ]; then TMP="$ROOT_DIR/dist/.linuxpkg" - rm -rf "$TMP"; mkdir -p "$TMP" - cp -R "$SRC"/. "$TMP"/ - rm -f "$TMP"/*.zip - if [ -f "$TMP/GC" ]; then - mv "$TMP/GC" "$TMP/GC-${VERSION}-linux-amd64" - chmod +x "$TMP/GC-${VERSION}-linux-amd64" 2>/dev/null || true + PKGNAME="GCL-${VERSION}-linux-amd64" + PKG="$TMP/$PKGNAME" + rm -rf "$TMP"; mkdir -p "$PKG" + cp -R "$SRC"/. "$PKG"/ + rm -f "$PKG"/*.zip + if [ -f "$PKG/GC" ]; then + mv "$PKG/GC" "$PKG/$PKGNAME" + chmod +x "$PKG/$PKGNAME" 2>/dev/null || true fi - if [ ! -f "$TMP/GC-UI" ]; then + if [ -f "$PKG/GC-SAVEDOG" ]; then + mkdir -p "$PKG/safedog" + mv "$PKG/GC-SAVEDOG" "$PKG/safedog/" + fi + if [ ! -f "$PKG/GC-UI" ]; then echo " !! 包内没有 Flutter 前端,启动器将使用内置 Avalonia 界面" fi - ZIP="$ROOT_DIR/dist/linux-amd64/GC-${VERSION}-linux-amd64.zip" + ZIP="$ROOT_DIR/dist/linux-amd64/$PKGNAME.zip" rm -f "$ZIP" - ( cd "$TMP" && zip -qry "$ZIP" . ) + ( cd "$TMP" && zip -qry "$ZIP" "$PKGNAME" ) rm -rf "$TMP" - echo " -> dist/linux-amd64/GC-${VERSION}-linux-amd64.zip" + echo " -> dist/linux-amd64/$PKGNAME.zip" fi # --- macOS:先得到真实 .app 目录(改名 + 同步 Info.plist)--- MACAPP="$ROOT_DIR/dist/mac-arm64/GC.app" if [ -d "$MACAPP" ]; then - FINAL="$ROOT_DIR/dist/GC-${VERSION}-mac-arm64.app" + FINAL="$ROOT_DIR/dist/GCL-${VERSION}-mac-arm64.app" rm -rf "$FINAL" mv "$MACAPP" "$FINAL" chmod +x "$FINAL/Contents/MacOS/GC" 2>/dev/null || true @@ -337,14 +350,14 @@ pack_launcher() { fi # --- 统一压缩:每个产物都打成同名 .zip,放进自己的平台目录 --- - # GC-1.0.3-mac-arm64.app -> dist/mac-arm64/GC-1.0.3-mac-arm64.zip + # GCL-1.0.3-mac-arm64.app -> dist/mac-arm64/GCL-1.0.3-mac-arm64.zip # 客户端下载时按「原名去掉扩展名 + .zip」取包,再解压回原名。 echo "==> 压缩为 zip" - for art in "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe "$ROOT_DIR"/dist/GC-"$VERSION"-*.app; do + for art in "$ROOT_DIR"/dist/GCL-"$VERSION"-*.exe "$ROOT_DIR"/dist/GCL-"$VERSION"-*.app; do [ -e "$art" ] || continue base=$(basename "$art") name="${base%.*}" # 去掉 .exe / .app - label="${name#GC-${VERSION}-}" # mac-arm64 / win-amd64 + label="${name#GCL-${VERSION}-}" # mac-arm64 / win-amd64 ZIP="$ROOT_DIR/dist/${label}/${name}.zip" mkdir -p "$ROOT_DIR/dist/${label}" rm -f "$ZIP" @@ -366,7 +379,7 @@ pack_launcher() { # 一次性删除又慢又不可逆,先挪走更安全(暂存区在下次构建开始时挪出 dist)。 TRASH="$ROOT_DIR/build/trash" mkdir -p "$TRASH" - for leftover in "$ROOT_DIR"/dist/GC-"$VERSION"-*.exe "$ROOT_DIR"/dist/GC-"$VERSION"-*.app; do + for leftover in "$ROOT_DIR"/dist/GCL-"$VERSION"-*.exe "$ROOT_DIR"/dist/GCL-"$VERSION"-*.app; do [ -e "$leftover" ] || continue mv "$leftover" "$TRASH/$(basename "$leftover")-$(date +%s)" 2>/dev/null || true done @@ -375,7 +388,7 @@ pack_launcher() { stamp_launcher_only echo "" echo "==> dist 里可发布的 zip:" - ls -lh "$ROOT_DIR"/dist/*/GC-"$VERSION"-*.zip 2>/dev/null || true + ls -lh "$ROOT_DIR"/dist/*/GCL-"$VERSION"-*.zip 2>/dev/null || true } # 删除 publish 过程中的中间目录:平台目录里只留最终 zip @@ -383,7 +396,7 @@ strip_intermediate_dirs() { for d in win-amd64 win-x64 win-arm64 mac-arm64 linux-amd64 linux-x64; do [ -d "$ROOT_DIR/dist/$d" ] || continue find "$ROOT_DIR/dist/$d" -mindepth 1 -maxdepth 1 \ - ! -name "GC-${VERSION}-*.zip" -exec rm -rf {} + 2>/dev/null || true + ! -name "GCL-${VERSION}-*.zip" -exec rm -rf {} + 2>/dev/null || true done find "$ROOT_DIR/dist" -name ".DS_Store" -delete 2>/dev/null || true }