Skip to content

Commit 56bb662

Browse files
committed
feat: 修改mac自动更新的文本
1 parent c9980c2 commit 56bb662

2 files changed

Lines changed: 3 additions & 23 deletions

File tree

tray/systray.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -221,17 +221,8 @@ func (m *Manager) onReady() {
221221
// dialog.Message("Failed to open control panel: %v", err).Title("Error").Error()
222222
// }
223223
case <-m.mRestartUpdate.ClickedCh:
224-
var msg, title string
225-
if runtime.GOOS == "windows" {
226-
msg = "这将停止所有服务并安装更新,是否继续?"
227-
title = "Confirm Update"
228-
} else if runtime.GOOS == "darwin" {
229-
msg = "将停止所有服务并打开新版本安装包目录,请手动双击安装包完成升级。是否继续?"
230-
title = "Confirm Update"
231-
} else {
232-
msg = "这将停止所有服务并安装更新,是否继续?"
233-
title = "Confirm Update"
234-
}
224+
msg := "这将停止所有服务并安装更新,是否继续?"
225+
title := "确认更新"
235226
if confirmed := dialog.Message(msg).Title(title).YesNo(); confirmed {
236227
if err := m.performUpdate(); err != nil {
237228
dialog.Message("执行更新失败: %v", err).Title("错误").Error()

tray/updater.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -399,18 +399,7 @@ func (p *PKGInstaller) Install() error {
399399
return nil
400400
}
401401

402-
func (p *PKGInstaller) installWithAppleScript() error {
403-
// slog.Info("直接打开安装包所在目录,等待用户手动安装")
404-
405-
// dir := filepath.Dir(p.pkgPath)
406-
// openCmd := exec.Command("open", dir)
407-
// if err := openCmd.Run(); err != nil {
408-
// slog.Error("打开目录失败:", err)
409-
// return fmt.Errorf("打开目录失败: %v", err)
410-
// }
411-
412-
// return nil
413-
402+
func (p *PKGInstaller) installWithAppleScript() error {
414403
// 启动 Installer.app 打开 .pkg,不等待安装完成
415404
logger.LogicLogger.Info("打开安装包,交由 Installer.app 安装(不等待)")
416405

0 commit comments

Comments
 (0)